[Libreoffice-commits] core.git: 2 commits - sfx2/source vcl/unx

[Maxim Monastirsky]

 sfx2/source/sidebar/SidebarController.cxx     |   23 +++++++++++------------
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |    1 +
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit e38c4105077b396b0b53e0296ae9cf142f51dd52
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Aug 30 22:35:00 2015 +0300

    tdf#83546 Expand the sidebar if it's hidden
    
    Change-Id: I92620cb1439bd13efcdbafcdc584abd8d7bb4345

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index afb8449..a45f83e 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -481,20 +481,19 @@ void SidebarController::UpdateConfigurations()
 void SidebarController::OpenThenSwitchToDeck (
     const ::rtl::OUString& rsDeckId)
 {
-    // fdo#67627 Clicking a second time on a Deck icon will close the Deck
-    if (IsDeckVisible(rsDeckId))
+    SfxSplitWindow* pSplitWindow = GetSplitWindow();
+    if ( pSplitWindow && !pSplitWindow->IsFadeIn() )
+        // tdf#83546 Collapsed sidebar should expand first
+        pSplitWindow->FadeIn();
+    else if ( IsDeckVisible( rsDeckId ) )
     {
-        // fdo#88241 Summoning an undocked sidebar a second time should close sidebar
-        if (!GetSplitWindow())
-        {
-            mpParentWindow->Close();
-            return;
-        }
-        else
-        {
+        if ( pSplitWindow )
+            // tdf#67627 Clicking a second time on a Deck icon will close the Deck
             RequestCloseDeck();
-            return;
-        }
+        else
+            // tdf#88241 Summoning an undocked sidebar a second time should close sidebar
+            mpParentWindow->Close();
+        return;
     }
     RequestOpenDeck();
     SwitchToDeck(rsDeckId);
commit 41c133250610243ed07bf294e4cee0ca9462be42
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Aug 30 14:58:50 2015 +0300

    GTK3: Native background for vertical toolbars
    
    Change-Id: I19483c3aa4d37e0f4fe159139c85d0a31f002b5a

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 7344423..fab6301 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -949,6 +949,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
         switch(nPart)
         {
         case PART_DRAW_BACKGROUND_HORZ:
+        case PART_DRAW_BACKGROUND_VERT:
             context = mpToolbarStyle;
             break;
         case PART_BUTTON: