diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-07-29 10:09:11 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-08-13 10:25:10 +0200 |
| commit | ff84704d05f1dc911c3daa05c226ca367fecc4ec (patch) | |
| tree | 565ad4bc2d56c60d5666fce39c2c78745fea8235 | |
| parent | 5d212915bab6829c91e7c2515a5a9da3a1a99971 (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/76529
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| -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 75c2055e41c3..bcc015306f90 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -543,10 +543,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); @@ -1097,6 +1093,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(); } |