sfx2/source/sidebar/SidebarController.cxx | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 91d5ee8e0ce29c1389e015b01b2afa6795e2f601
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Mon Jul 29 10:09:11 2019 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Jul 29 12:18:13 2019 +0200
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.mehrbr...@cib.de>
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();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
