sfx2/source/sidebar/UnoDeck.cxx | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 12403996d2356bc40c89c37a9fbe2a727180bf83
Author: Ilhan Yesil <ilhanye...@gmx.de>
AuthorDate: Thu Nov 12 15:33:24 2020 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Jan 25 09:53:04 2021 +0100
tdf#138160 Set minimal width of sidebar tabpage after UNO call
Call OpenThenToggleDeck in SidebarController instead SwitchToDeck
to ensure the minimal width of the tabpage is considered and
the width of the sidebar is set correctly.
Change-Id: I27c21572b5c648b3ddbb4d908d40af686ac87a9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105758
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 7206de4f3d9eecdcbdd98294fa50f01c4c9ece9c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109797
Tested-by: Michael Weghorn <m.wegh...@posteo.de>
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sfx2/source/sidebar/UnoDeck.cxx b/sfx2/source/sidebar/UnoDeck.cxx
index 9a77c064b3e3..cf4b3a6a9228 100644
--- a/sfx2/source/sidebar/UnoDeck.cxx
+++ b/sfx2/source/sidebar/UnoDeck.cxx
@@ -95,13 +95,16 @@ void SAL_CALL SfxUnoDeck::activate( const sal_Bool
bActivate )
SidebarController* pSidebarController = getSidebarController();
+ // tdf#138160: OpenThenToggleDeck takes care of minimal width
if (bActivate)
- pSidebarController->SwitchToDeck(mDeckId);
+ pSidebarController->OpenThenToggleDeck(mDeckId);
else
+ {
pSidebarController->SwitchToDefaultDeck();
+ // update the sidebar
+ pSidebarController->NotifyResize();
+ }
- // update the sidebar
- pSidebarController->NotifyResize();
}
uno::Reference<ui::XPanels> SAL_CALL SfxUnoDeck::getPanels()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
