Kaydet (Commit) b9c38b78 authored tarafından Jim Raykowski's avatar Jim Raykowski Kaydeden (comit) Maxim Monastirsky

tdf#119577 Ignore escape key press on sidebar toolboxes not handled by

...focus manager.

This prevents escape key press on More Options tool box in some panel
title bars from sending focus to doc view.

Change-Id: Iaac9bf31494e4e35f30350580acaa9f42ead49a0
Reviewed-on: https://gerrit.libreoffice.org/59783
Tested-by: Jenkins
Reviewed-by: 's avatarMaxim Monastirsky <momonasmon@gmail.com>
üst b914c4c9
......@@ -50,6 +50,7 @@ public:
ImplToolItems::size_type nPos = APPEND) override;
virtual bool EventNotify(NotifyEvent& rEvent) override;
virtual void KeyInput( const KeyEvent& rKEvt ) override;
void SetController(const sal_uInt16 nItemId,
const css::uno::Reference<css::frame::XToolbarController>& rxController);
......
......@@ -137,6 +137,12 @@ bool SidebarToolBox::EventNotify (NotifyEvent& rEvent)
return ToolBox::EventNotify(rEvent);
}
void SidebarToolBox::KeyInput(const KeyEvent& rKEvt)
{
if (KEY_ESCAPE != rKEvt.GetKeyCode().GetCode())
ToolBox::KeyInput(rKEvt);
}
void SidebarToolBox::CreateController (
const sal_uInt16 nItemId,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
......
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