diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-02 13:08:39 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-02 15:13:45 +0000 |
| commit | d013a5a38c6460a22434c6ba637c63d2118f12dc (patch) | |
| tree | e63b116c642fcab64f73eeb6097839d7e4285884 | |
| parent | cff184a4528c9c0e7112fe6470c5c0d2d4bfe41d (diff) | |
Related: tdf#92516 make menu accelerators always work even if...
keyboard not used yet.
The gtk2/3 menus appear to work this way. (And when not in gtk2/3
it shouldn't disable the accelerators for other platforms anyway)
(cherry picked from commit f6d0d92a5e249413df99a7f3677a28efe6d45426)
Change-Id: Ib7a99bd9039cd07120b3b77380f810b5b028fd57
Reviewed-on: https://gerrit.libreoffice.org/27794
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | vcl/source/window/menufloatingwindow.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index c00a86926ede..20cb2e5fd6fd 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -1101,18 +1101,9 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent ) sal_Unicode nCharCode = rKEvent.GetCharCode(); sal_uInt16 nPos = 0; sal_uInt16 nDuplicates = 0; - MenuItemData* pData = (nCharCode && pMenu) ? + MenuItemData* pData = (nCharCode && pMenu && ImplGetSVData()->maNWFData.mbEnableAccel) ? pMenu->GetItemList()->SearchItem(nCharCode, rKEvent.GetKeyCode(), nPos, nDuplicates, nHighlightedItem) : nullptr; - bool bConsume = false; - bool accel = ImplGetSVData()->maNWFData.mbEnableAccel; - if (pData && accel) - { - Menu *men = pMenu; - while (men && !men->IsMenuBar()) - men = men->pStartedFrom; - bConsume = !men || (static_cast<MenuBarWindow*>(men->pWindow.get()))->GetMBWMenuKey(); - } - if (bConsume) + if (pData) { if ( pData->pSubMenu || nDuplicates > 1 ) { |