diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-20 11:18:21 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-20 15:23:24 +0200 |
| commit | f9a48edc0a4c9144a2091ab782f6a6676bfcf4bf (patch) | |
| tree | 97c04219d1f89e65c2ffc77cda9f1a9f3b1bbf5d | |
| parent | 0ae13c77b6b20c2b58131fd21fea0ffce2a7a825 (diff) | |
Related: tdf#101881 keys not handled by native menubar sent to vcl one
so 'o' pops up native menu, shift+o is unhandled by native, sent to
vcl one which pops up some shoddy emulated version of the o menu
Change-Id: Id6b0d27dd81f8a6d141cef79cc4825703c923636
Reviewed-on: https://gerrit.libreoffice.org/42538
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/window/menubarwindow.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 58d97a1fba8f..647eac636494 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -693,6 +693,12 @@ bool MenuBarWindow::HandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu ) } } + // no key events if native menus + if (pMenu->ImplGetSalMenu() && pMenu->ImplGetSalMenu()->VisibleMenuBar()) + { + return false; + } + if ( nCode == KEY_MENU && !rKEvent.GetKeyCode().IsShift() ) // only F10, not Shift-F10 { mbAutoPopup = ImplGetSVData()->maNWFData.mbOpenMenuOnF10; |