diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-03 11:06:22 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-07-13 21:15:01 +0200 |
| commit | 6adddbfb6b0fd9e0348546114f9dd2d035c1be3f (patch) | |
| tree | 761ae0149fb3552c57980fcf7b4fa0c3617c1775 /sd | |
| parent | 1a90ab3feb9cf3c92e9b142778d4c88acbad1f21 (diff) | |
Resolves: tdf#88396 switching to sidebar panel will toggle it *off*...
if its already visible.
This solves tdf#88396, but I did this fix originally for....
on switching to slide layouts panel move into slide layout context
i.e. exit current textbox edit and shape selection
(cherry picked from commit 05aaef55252bc9f90cbbcc1967c38ab9a5a6c798)
OpenThenSwitchToDeck actually *toggles* deck visibility
so rename it to that and add a OpenThenSwitchToDeck that actually
does that, using the Toggle varient as the callback from the
sidebar button which toggles the current deck on/off
which retains the features of
// tdf#67627 Clicking a second time on a Deck icon will close the Deck
// tdf#88241 Summoning an undocked sidebar a second time should close sidebar
but means that calls to OpenThenSwitchToDeck from e.g. slide layout
don't auto close it if that deck is already open
(cherry picked from commit b81daea4a78083def286fa2d5360b152b7a703fd)
3e3724626b93447a7ab6bc7032e9c6839dabcf55
Change-Id: I16a2fca158cb4caab7b6bd001742df698735dd2b
Reviewed-on: https://gerrit.libreoffice.org/27071
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit e1e61bf5e5f368fc1ea579f8ae5eec9faafbd599)
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/ViewShellImplementation.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index b523e03d5345..794430425dbc 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -120,6 +120,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( if (!pArgs || pArgs->Count() == 1 || pArgs->Count() == 2 ) { // First make sure that the sidebar is visible + mrViewShell.GetDrawView()->SdrEndTextEdit(); + mrViewShell.GetDrawView()->UnmarkAll(); mrViewShell.GetViewFrame()->ShowChildWindow(SID_SIDEBAR); sfx2::sidebar::Sidebar::ShowPanel( "SdLayoutsPanel", |