diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-10-24 00:22:30 -0800 |
|---|---|---|
| committer | Jim Raykowski <raykowj@gmail.com> | 2018-10-28 19:55:08 +0100 |
| commit | a21ec77601e2dd15a2281727b827db9310cece6d (patch) | |
| tree | a28fc29b5c080eac75054d8c15e09e8cf0725c6e /sfx2/source/sidebar/SidebarDockingWindow.cxx | |
| parent | da2ee51346814072cd55bce3cf2d2b385500beb0 (diff) | |
Fix Sidebar docking key regression
Add back Ctrl+Shift+F10 undocking/docking handling. This regression was
introduced by me in tdf#115434 Fix key press misbehaviors in sidebar.
Change-Id: I29a563b2eb96be8a6b346454fddc1605dbc4aba6
Reviewed-on: https://gerrit.libreoffice.org/62268
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
Diffstat (limited to 'sfx2/source/sidebar/SidebarDockingWindow.cxx')
| -rw-r--r-- | sfx2/source/sidebar/SidebarDockingWindow.cxx | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index 1ed62e98e5af..141097a70c0c 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -121,22 +121,26 @@ bool SidebarDockingWindow::EventNotify(NotifyEvent& rEvent) if (MouseNotifyEvent::KEYINPUT == nType) { const vcl::KeyCode& rKeyCode = rEvent.GetKeyEvent()->GetKeyCode(); - if (!mpAccel) + if (!(rKeyCode.GetCode() == KEY_F10 && rKeyCode.GetModifier() && + rKeyCode.IsShift() && rKeyCode.IsMod1())) { - mpAccel = svt::AcceleratorExecute::createAcceleratorHelper(); - mpAccel->init(comphelper::getProcessComponentContext(), mpSidebarController->getXFrame()); - } - const OUString aCommand(mpAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rKeyCode))); - if (".uno:DesignerDialog" == aCommand) - { - std::shared_ptr<PanelDescriptor> xPanelDescriptor = + if (!mpAccel) + { + mpAccel = svt::AcceleratorExecute::createAcceleratorHelper(); + mpAccel->init(comphelper::getProcessComponentContext(), mpSidebarController->getXFrame()); + } + const OUString aCommand(mpAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rKeyCode))); + if (".uno:DesignerDialog" == aCommand) + { + std::shared_ptr<PanelDescriptor> xPanelDescriptor = mpSidebarController->GetResourceManager()->GetPanelDescriptor( "StyleListPanel" ); - if ( xPanelDescriptor && mpSidebarController->IsDeckVisible( xPanelDescriptor->msDeckId ) ) - Close(); - return true; + if ( xPanelDescriptor && mpSidebarController->IsDeckVisible( xPanelDescriptor->msDeckId ) ) + Close(); + return true; + } + if (".uno:Sidebar" != aCommand) + return true; } - if (".uno:Sidebar" != aCommand) - return true; } else if (MouseNotifyEvent::MOUSEBUTTONDOWN == nType) { |