sfx2/source/sidebar/SidebarController.cxx | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
New commits: commit 6390640fcce39eaf7612bcbd8f61e2570c3e50e7 Author: Maxim Monastirsky <momonas...@gmail.com> Date: Sun Aug 30 22:35:00 2015 +0300 tdf#83546 Expand the sidebar if it's hidden Change-Id: I92620cb1439bd13efcdbafcdc584abd8d7bb4345 (cherry picked from commit e38c4105077b396b0b53e0296ae9cf142f51dd52) Reviewed-on: https://gerrit.libreoffice.org/18245 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 4115e88..9afa3f5 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -455,20 +455,19 @@ void SidebarController::UpdateConfigurations() void SidebarController::OpenThenSwitchToDeck ( const ::rtl::OUString& rsDeckId) { - // fdo#67627 Clicking a second time on a Deck icon will close the Deck - if (IsDeckVisible(rsDeckId)) + SfxSplitWindow* pSplitWindow = GetSplitWindow(); + if ( pSplitWindow && !pSplitWindow->IsFadeIn() ) + // tdf#83546 Collapsed sidebar should expand first + pSplitWindow->FadeIn(); + else if ( IsDeckVisible( rsDeckId ) ) { - // fdo#88241 Summoning an undocked sidebar a second time should close sidebar - if (!GetSplitWindow()) - { - mpParentWindow->Close(); - return; - } - else - { + if ( pSplitWindow ) + // tdf#67627 Clicking a second time on a Deck icon will close the Deck RequestCloseDeck(); - return; - } + else + // tdf#88241 Summoning an undocked sidebar a second time should close sidebar + mpParentWindow->Close(); + return; } RequestOpenDeck(); SwitchToDeck(rsDeckId);
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits