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:21:06 +0200 |
| commit | a643c1fa95899f89e2add8c7ae89eed7b4fca224 (patch) | |
| tree | 5e4f297a281a29b93d78a758d8b4022b7735c65d /sfx2 | |
| parent | f3c60c60d03947961d893e23c0e4baf20fb0107b (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/76531
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@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 8142297c56f0..672dd305aadb 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -565,10 +565,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); @@ -1122,6 +1118,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(); } |