diff options
author | Trent MacAlpine <tmacalp@gmail.com> | 2015-01-18 13:37:20 -0500 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-20 13:56:55 +0000 |
commit | 7bb81cd93ad3a8d24cc69bc32ad22a5cbe1ec955 (patch) | |
tree | 8e7c33c7c666f88712893c41c5519dc9acc736ca /sfx2 | |
parent | 915469e5f70b179f4219d8f981802fcc9d5e6959 (diff) |
fdo#88241 Floating sidebar second call to same item should dismiss it
fixed in master by commit# 592984cea1a9cc545358b8d6077113a658834aa5
Note that this was written to be used in combination with commit
304e2002a053e9eb54e36462165eca831da8aeb2 to give back the behavior of
calling and dismissing the styles and formatting dialog.
Change-Id: I087f60c4bc0fa46b59bc17abf447553d7fda4074
Reviewed-on: https://gerrit.libreoffice.org/14027
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index a0e05fc45f5e..620bfeb55993 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -520,8 +520,17 @@ void SidebarController::OpenThenSwitchToDeck ( // fdo#67627 Clicking a second time on a Deck icon will close the Deck if (IsDeckVisible(rsDeckId)) { - RequestCloseDeck(); - return; + // fdo#88241 Summoning an undocked sidebar a second time should close sidebar + if (!GetSplitWindow()) + { + mpParentWindow->Close(); + return; + } + else + { + RequestCloseDeck(); + return; + } } RequestOpenDeck(); SwitchToDeck(rsDeckId); |