Kaydet (Commit) a21ec776 authored tarafından Jim Raykowski's avatar Jim Raykowski

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: 's avatarJim Raykowski <raykowj@gmail.com>
üst da2ee513
......@@ -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)
{
......
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