From e5db4a378657b28c3238bd437c809fc07689f2a7 Mon Sep 17 00:00:00 2001
From: nucleo <nucleo@fedoraproject.org>
Date: May 30 2013 12:00:01 +0000
Subject: fix thumbbar visibility after fullscreen mode kde#319876


---

diff --git a/digikam-3.2.0-fullscreen.patch b/digikam-3.2.0-fullscreen.patch
index 7917738..9c9817f 100644
--- a/digikam-3.2.0-fullscreen.patch
+++ b/digikam-3.2.0-fullscreen.patch
@@ -261,3 +261,85 @@ index 4df7e92..2dfee0c 100644
  }
  
  void Sidebar::restore(const QList<QWidget*> thirdWidgetsToRestore, const QList<int>& sizes)
+diff --git a/digikam/main/digikamapp.cpp b/digikam/main/digikamapp.cpp
+index 782e64c..c28014e 100644
+--- a/digikam/main/digikamapp.cpp
++++ b/digikam/main/digikamapp.cpp
+@@ -3028,7 +3028,7 @@ void DigikamApp::showThumbBar(bool visible)
+ 
+ bool DigikamApp::thumbbarVisibility() const
+ {
+-    return d->view->isThumbBarVisible();
++    return d->showBarAction->isChecked();
+ }
+ 
+ }  // namespace Digikam
+diff --git a/digikam/views/digikamview.cpp b/digikam/views/digikamview.cpp
+index f7242a0..475bfdf 100644
+--- a/digikam/views/digikamview.cpp
++++ b/digikam/views/digikamview.cpp
+@@ -1952,11 +1952,6 @@ void DigikamView::toggleShowBar(bool b)
+     d->stackedview->thumbBarDock()->showThumbBar(b);
+ }
+ 
+-bool DigikamView::isThumbBarVisible()
+-{
+-    return d->stackedview->thumbBarDock()->isVisible();
+-}
+-
+ void DigikamView::setRecurseAlbums(bool recursive)
+ {
+     d->iconView->imageAlbumModel()->setRecurseAlbums(recursive);
+diff --git a/digikam/views/digikamview.h b/digikam/views/digikamview.h
+index 669eac9..9229fa6 100644
+--- a/digikam/views/digikamview.h
++++ b/digikam/views/digikamview.h
+@@ -79,7 +79,6 @@ public:
+     void hideSideBars();
+     void setThumbSize(int size);
+     void toggleShowBar(bool);
+-    bool isThumbBarVisible();
+     void setRecurseAlbums(bool recursive);
+     void setRecurseTags(bool recursive);
+     void imageTransform(RotationMatrix::TransformationAction transform);
+diff --git a/utilities/importui/main/importui.cpp b/utilities/importui/main/importui.cpp
+index f136998..03b53bb 100644
+--- a/utilities/importui/main/importui.cpp
++++ b/utilities/importui/main/importui.cpp
+@@ -2588,7 +2588,7 @@ void ImportUI::showThumbBar(bool visible)
+ 
+ bool ImportUI::thumbbarVisibility() const
+ {
+-    return d->view->isThumbBarVisible();
++    return d->showBarAction->isChecked();
+ }
+ 
+ }  // namespace Digikam
+diff --git a/utilities/importui/views/importview.cpp b/utilities/importui/views/importview.cpp
+index fb30c48..a15728d 100644
+--- a/utilities/importui/views/importview.cpp
++++ b/utilities/importui/views/importview.cpp
+@@ -775,11 +775,6 @@ void ImportView::toggleShowBar(bool b)
+     d->StackedView->thumbBarDock()->showThumbBar(b);
+ }
+ 
+-bool ImportView::isThumbBarVisible()
+-{
+-    return d->StackedView->thumbBarDock()->isVisible();
+-}
+-
+ void ImportView::scrollTo(const QString& folder, const QString& file)
+ {
+     CamItemInfo info  = camItemInfo(folder, file);
+diff --git a/utilities/importui/views/importview.h b/utilities/importui/views/importview.h
+index 4b48970..42e01b1 100644
+--- a/utilities/importui/views/importview.h
++++ b/utilities/importui/views/importview.h
+@@ -58,7 +58,6 @@ public:
+     void hideSideBars();
+     void setThumbSize(int size);
+     void toggleShowBar(bool b);
+-    bool isThumbBarVisible();
+ 
+     void scrollTo(const QString& folder, const QString& file);
+ 
diff --git a/digikam.spec b/digikam.spec
index 5ad529f..bf3eecc 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 
 Name:    digikam
 Version: 3.2.0
-Release: 3%{?pre}%{?dist}
+Release: 4%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -27,6 +27,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
+# https://projects.kde.org/projects/extragear/graphics/digikam/repository/revisions/4f892fb62241940fd2a0ceeffa1d2302576611d8
 Patch100: digikam-3.2.0-fullscreen.patch
 
 BuildRequires: eigen3-devel
@@ -534,6 +535,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Thu May 30 2013 Alexey Kurov <nucleo@fedoraproject.org> - 3.2.0-4
+- fix thumbbar visibility after fullscreen mode kde#319876
+
 * Wed May 29 2013 Alexey Kurov <nucleo@fedoraproject.org> - 3.2.0-3
 - fix sidebar in fullscreen mode kde#319876