From f9a48edc0a4c9144a2091ab782f6a6676bfcf4bf Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 20 Sep 2017 11:18:21 +0100 Subject: Related: tdf#101881 keys not handled by native menubar sent to vcl one MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Caolán McNamara --- vcl/source/window/menubarwindow.cxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'vcl/source/window/menubarwindow.cxx') 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; -- cgit v1.2.3