Kaydet (Commit) 6390640f authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky Kaydeden (comit) Caolán McNamara

tdf#83546 Expand the sidebar if it's hidden

Change-Id: I92620cb1439bd13efcdbafcdc584abd8d7bb4345
(cherry picked from commit e38c4105)
Reviewed-on: https://gerrit.libreoffice.org/18245Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 56e49887
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment