diff options
| author | Simon Long <simon@raspberrypi.org> | 2015-07-08 18:02:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-09 15:07:24 +0000 |
| commit | 74407aef94b6d8dfdd69891c4a6e578587ef3e71 (patch) | |
| tree | cc8c8f9cde981f90760cb7fdaa02688713989f83 /vcl/source/window/syswin.cxx | |
| parent | 40ade8d04380083e383d6a6e50e5c254fcde2b2f (diff) | |
tdf#92630 Enable auto-accelerator behaviour for gtk
Change-Id: I671177dd1f9e535c28a29bcbd6b74f1c789371ea
Reviewed-on: https://gerrit.libreoffice.org/16883
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/window/syswin.cxx')
| -rw-r--r-- | vcl/source/window/syswin.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index c08a60168a93..2ec48b30bc85 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -126,7 +126,8 @@ void SystemWindow::dispose() bool SystemWindow::Notify( NotifyEvent& rNEvt ) { // capture KeyEvents for menu handling - if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) + if (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT || + rNEvt.GetType() == MouseNotifyEvent::COMMAND) { MenuBar* pMBar = mpMenuBar; if ( !pMBar && ( GetType() == WINDOW_FLOATINGWINDOW ) ) @@ -135,7 +136,15 @@ bool SystemWindow::Notify( NotifyEvent& rNEvt ) if( pWin && pWin->IsSystemWindow() ) pMBar = static_cast<SystemWindow*>(pWin)->GetMenuBar(); } - if ( pMBar && pMBar->ImplHandleKeyEvent( *rNEvt.GetKeyEvent(), false ) ) + bool bDone(false); + if (pMBar) + { + if (rNEvt.GetType() == MouseNotifyEvent::COMMAND) + bDone = pMBar->ImplHandleCmdEvent(*rNEvt.GetCommandEvent()); + else + bDone = pMBar->ImplHandleKeyEvent(*rNEvt.GetKeyEvent(), false); + } + if (bDone) return true; } |