diff options
Diffstat (limited to 'sfx2/source/sidebar/SidebarController.cxx')
-rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index afb844936347..a45f83e8a8a5 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); |