diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-07-29 10:09:11 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-07-29 12:18:13 +0200 |
commit | 91d5ee8e0ce29c1389e015b01b2afa6795e2f601 (patch) | |
tree | 7c1af72cf1b62d6cdb41d25a6f3529fb159dd0dc /sfx2 | |
parent | c1281e25c6de949c387ef42554a84040b86bc4b0 (diff) |
Expand collapsed sidebar when calling XSidebarProvider::showDecks
This UNO call did not work correctly when the sidebar was completely collapsed.
Change-Id: I3de0b89d95aa81287c36911bbd52a9941d9886b3
Reviewed-on: https://gerrit.libreoffice.org/76525
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 22b022bf09ee..4dd30f0b1a71 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -602,10 +602,6 @@ void SidebarController::OpenThenToggleDeck ( void SidebarController::OpenThenSwitchToDeck ( const OUString& rsDeckId) { - SfxSplitWindow* pSplitWindow = GetSplitWindow(); - if ( pSplitWindow && !pSplitWindow->IsFadeIn() ) - // tdf#83546 Collapsed sidebar should expand first - pSplitWindow->FadeIn(); RequestOpenDeck(); SwitchToDeck(rsDeckId); @@ -1200,6 +1196,11 @@ void SidebarController::RequestCloseDeck() void SidebarController::RequestOpenDeck() { + SfxSplitWindow* pSplitWindow = GetSplitWindow(); + if ( pSplitWindow && !pSplitWindow->IsFadeIn() ) + // tdf#83546 Collapsed sidebar should expand first + pSplitWindow->FadeIn(); + mbIsDeckRequestedOpen = true; UpdateDeckOpenState(); } |