diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-11-22 23:31:37 -0900 |
|---|---|---|
| committer | Jim Raykowski <raykowj@gmail.com> | 2018-12-31 08:03:41 +0100 |
| commit | cb834ae5c8d5dbecdbc3729bc21889d97d8b582f (patch) | |
| tree | 7d8afb720a81ff0a136635c5de629f08d63c6f44 /sfx2 | |
| parent | 639013342e216776d1c6a8a6ff3ce29d1355b8ea (diff) | |
Provide keyboard navigation to Shortcuts tool box and Hamburger menu in
NotebookbarTabControl
Use Ctrl+Right/Left arrow to move focus among current notebookbar tab
control tab title, hamburger menu, and shortcuts tool box.
Change-Id: Ia7b22ff03fce7148eb411cfe9eaabc247b737cb5
Reviewed-on: https://gerrit.libreoffice.org/63875
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/notebookbar/NotebookbarTabControl.cxx | 92 |
1 files changed, 92 insertions, 0 deletions
diff --git a/sfx2/source/notebookbar/NotebookbarTabControl.cxx b/sfx2/source/notebookbar/NotebookbarTabControl.cxx index 994dbf7d3a3f..2e5f18af3150 100644 --- a/sfx2/source/notebookbar/NotebookbarTabControl.cxx +++ b/sfx2/source/notebookbar/NotebookbarTabControl.cxx @@ -126,6 +126,20 @@ public: mbUseDefaultButtonSize = false; SetToolboxButtonSize(ToolBoxButtonSize::Small); } + + virtual void KeyInput( const KeyEvent& rKEvt ) override + { + if ( rKEvt.GetKeyCode().IsMod1() ) + { + sal_uInt16 nCode( rKEvt.GetKeyCode().GetCode() ); + if ( nCode == KEY_RIGHT || nCode == KEY_LEFT ) + { + GetParent()->KeyInput( rKEvt ); + return; + } + } + return sfx2::sidebar::SidebarToolBox::KeyInput( rKEvt ); + } }; NotebookbarTabControl::NotebookbarTabControl( Window* pParent ) @@ -139,6 +153,84 @@ NotebookbarTabControl::~NotebookbarTabControl() { } +void NotebookbarTabControl::ArrowStops( sal_uInt16 nCode ) +{ + ToolBox* pToolBox( GetToolBox() ); + PushButton* pOpenMenu( GetOpenMenu() ); + + if ( nCode == KEY_LEFT ) + { + if ( HasFocus() ) + { + if ( pToolBox ) + pToolBox->GrabFocus(); + else if ( pOpenMenu ) + pOpenMenu->GrabFocus(); + } + else if ( pToolBox && pToolBox->HasFocus() ) + { + if ( pOpenMenu ) + pOpenMenu->GrabFocus(); + else + GrabFocus(); + } + else if ( pOpenMenu && pOpenMenu->HasFocus() ) + { + GrabFocus(); + } + } + else if ( nCode == KEY_RIGHT ) + { + if ( HasFocus() ) + { + if ( pOpenMenu ) + pOpenMenu->GrabFocus(); + else if ( pToolBox ) + pToolBox->GrabFocus(); + } + else if ( pToolBox && pToolBox->HasFocus() ) + { + GrabFocus(); + } + else if ( pOpenMenu && pOpenMenu->HasFocus() ) + { + if ( pToolBox ) + pToolBox->GrabFocus(); + else + GrabFocus(); + } + } +} + +void NotebookbarTabControl::KeyInput( const KeyEvent& rKEvt ) +{ + if ( rKEvt.GetKeyCode().IsMod1() ) + { + sal_uInt16 nCode( rKEvt.GetKeyCode().GetCode() ); + if ( nCode == KEY_RIGHT || nCode == KEY_LEFT ) + { + ArrowStops( nCode ); + return; + } + } + return NotebookbarTabControlBase::KeyInput( rKEvt ); +} + +bool NotebookbarTabControl::EventNotify( NotifyEvent& rNEvt ) +{ + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) + { + const vcl::KeyCode& rKey = rNEvt.GetKeyEvent()->GetKeyCode(); + sal_uInt16 nCode = rKey.GetCode(); + if ( rKey.IsMod1() && ( nCode == KEY_RIGHT || nCode == KEY_LEFT ) ) + { + ArrowStops( nCode ); + return true; + } + } + return NotebookbarTabControlBase::EventNotify( rNEvt ); +} + void NotebookbarTabControl::StateChanged(StateChangedType nStateChange) { if( !m_bInitialized && SfxViewFrame::Current() ) |