[digikam] fix sidebar in fullscreen mode kde#319876

[nucleo]

commit e5b25b0954c251d8995abacc1515d80804c08ccf
Author: nucleo <nucleo at fedoraproject.org>
Date:   Wed May 29 16:58:56 2013 +0300

    fix sidebar in fullscreen mode kde#319876

 digikam-3.2.0-fullscreen.patch |   70 ++++++++++++++++++++++++++++++++++++++++
 digikam.spec                   |   14 +++++---
 2 files changed, 79 insertions(+), 5 deletions(-)
---
diff --git a/digikam-3.2.0-fullscreen.patch b/digikam-3.2.0-fullscreen.patch
index 1487d34..7917738 100644
--- a/digikam-3.2.0-fullscreen.patch
+++ b/digikam-3.2.0-fullscreen.patch
@@ -191,3 +191,73 @@ index 166de47..8039650 100644
      d->fullScreenSettings->readSettings(group);
  }
  
+diff --git a/libs/widgets/common/dxmlguiwindow.cpp b/libs/widgets/common/dxmlguiwindow.cpp
+index ebec2dd..b577d68 100644
+--- a/libs/widgets/common/dxmlguiwindow.cpp
++++ b/libs/widgets/common/dxmlguiwindow.cpp
+@@ -178,7 +178,8 @@ void DXmlGuiWindow::slotToggleFullScreen(bool set)
+ 
+         // restore sidebars
+ 
+-        showSideBars(true);
++        if ((d->fsOptions & FS_SIDEBARS) && d->fullScreenHideSideBars)
++            showSideBars(true);
+ 
+         // restore thummbbar
+ 
+diff --git a/libs/widgets/common/sidebar.cpp b/libs/widgets/common/sidebar.cpp
+index 4df7e92..2dfee0c 100644
+--- a/libs/widgets/common/sidebar.cpp
++++ b/libs/widgets/common/sidebar.cpp
+@@ -44,6 +44,7 @@
+ #include <kdeversion.h>
+ #include <kglobal.h>
+ #include <kiconloader.h>
++#include <kdebug.h>
+ 
+ namespace Digikam
+ {
+@@ -85,7 +86,9 @@ public:
+ 
+     bool                          minimizedDefault;
+     bool                          minimized;
+-    bool                          isMinimized;      // Backup of minimized status (used with Fullscreen)
++    bool                          isMinimized;      // Backup of shrinked status before backup(), restored by restore()
++                                                    // NOTE: when sidebar is hidden, only icon bar is affected. If sidebar view is 
++                                                    // visible, this one must be shrink and restored accordingly.
+ 
+     int                           tabs;
+     int                           activeTab;
+@@ -182,12 +185,11 @@ void Sidebar::doSaveState()
+ 
+ void Sidebar::backup()
+ {
++    // backup preview state of sidebar view (shrink or not)
+     d->isMinimized = d->minimized;
+-
+-    if (!d->isMinimized)
+-    {
+-        shrink();
+-    }
++    
++    // In all case, shrink sidebar view 
++    shrink();
+ 
+     KMultiTabBar::hide();
+ }
+@@ -205,12 +207,13 @@ void Sidebar::backup(const QList<QWidget*> thirdWidgetsToBackup, QList<int> *siz
+ 
+ void Sidebar::restore()
+ {
++    KMultiTabBar::show();
++
++    // restore preview state of sidebar view, stored in backup()
+     if (!d->isMinimized)
+     {
+         expand();
+     }
+-
+-    KMultiTabBar::show();
+ }
+ 
+ void Sidebar::restore(const QList<QWidget*> thirdWidgetsToRestore, const QList<int>& sizes)
diff --git a/digikam.spec b/digikam.spec
index 32610a8..5ad529f 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -4,13 +4,13 @@
 %define videoslideshow 1
 %endif
 
-Name:	 digikam
+Name:    digikam
 Version: 3.2.0
-Release: 2%{?pre}%{?dist}
+Release: 3%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
-URL:	 http://www.digikam.org/
+URL:     http://www.digikam.org/
 Source0: http://download.kde.org/%{?pre:un}stable/digikam/digikam-%{version}%{?pre:-%{pre}}.tar.bz2
 
 # digiKam not listed as a media handler for pictures in Nautilus (#516447)
@@ -26,6 +26,7 @@ Patch51:  digikam-3.1.0-opencv20.patch
 
 # Ensure that full screen settings is loaded at initialization of AlbumGUI.
 # https://projects.kde.org/projects/extragear/graphics/digikam/repository/revisions/439316380574b6dc8b3c3ed37efa1e74656c342f
+# https://projects.kde.org/projects/extragear/graphics/digikam/repository/revisions/b8f20122e42acb5424cba7aff034101f068c5a90
 Patch100: digikam-3.2.0-fullscreen.patch
 
 BuildRequires: eigen3-devel
@@ -533,6 +534,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Wed May 29 2013 Alexey Kurov <nucleo at fedoraproject.org> - 3.2.0-3
+- fix sidebar in fullscreen mode kde#319876
+
 * Wed May 29 2013 Alexey Kurov <nucleo at fedoraproject.org> - 3.2.0-2
 - fix fullscreen settings loading kde#320016
 
@@ -830,7 +834,7 @@ update-desktop-database -q &> /dev/null
 * Sat Nov 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.9.beta6
 - digiKam not listed as a media handler for pictures in Nautilus (#516447)
 
-* Mon Nov 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.8.beta6
+* Sun Nov 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.8.beta6
 - digikam-1.0.0-beta6
 
 * Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.7.beta5
@@ -937,7 +941,7 @@ update-desktop-database -q &> /dev/null
 - digikam-0.9.3-rc1
 - BR: kdelibs3-devel
 
-* Thu Nov 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-0.2.beta3
+* Tue Nov 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-0.2.beta3
 - digikam-0.9.3-beta3
 
 * Tue Nov 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-0.1.beta2