summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2018-06-17 12:27:00 -0800
committerHeiko Tietze <tietze.heiko@gmail.com>2018-06-19 11:16:00 +0200
commit657c141acbae11945072ae3f38982cb225131de6 (patch)
tree7c0fa96a658b44439294bb93be4e4fb76e3be13c /sfx2
parentd0d0beb5f515ca6f6b777e0e64575e4e7f4626dc (diff)
tdf#101915 make F11 close the sidebar when focus is in sidebar
...style list panel Change-Id: I034ba4310cd0942aad0a2e6f807213e14327e7b4 Reviewed-on: https://gerrit.libreoffice.org/55969 Reviewed-by: V Stuart Foote <vstuart.foote@utsa.edu> Tested-by: Jenkins Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> Tested-by: Heiko Tietze <tietze.heiko@gmail.com> (cherry picked from commit 3a8375eb974eb8ba36ac616478acd881b70f8e19) Reviewed-on: https://gerrit.libreoffice.org/56078
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/sidebar/SidebarDockingWindow.cxx13
1 files changed, 11 insertions, 2 deletions
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index b962d86f9e10..1c02f63a41e6 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -116,9 +116,18 @@ bool SidebarDockingWindow::EventNotify(NotifyEvent& rEvent)
{
MouseNotifyEvent nType = rEvent.GetType();
if (MouseNotifyEvent::KEYINPUT == nType)
+ {
+ const vcl::KeyCode& rKeyCode = rEvent.GetKeyEvent()->GetKeyCode();
+ if ( ( 0 == rKeyCode.GetModifier() ) && ( KEY_F11 == rKeyCode.GetCode() ) )
+ {
+ std::shared_ptr<PanelDescriptor> xPanelDescriptor =
+ mpSidebarController->GetResourceManager()->GetPanelDescriptor( "StyleListPanel" );
+ if ( xPanelDescriptor && mpSidebarController->IsDeckVisible( xPanelDescriptor->msDeckId ) )
+ Close();
+ }
return true;
-
- if (MouseNotifyEvent::MOUSEBUTTONDOWN == nType)
+ }
+ else if (MouseNotifyEvent::MOUSEBUTTONDOWN == nType)
{
const MouseEvent *mEvt = rEvent.GetMouseEvent();
if (mEvt->IsLeft())