vcl/osx/vclnsapp.mm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9d77e7551e56b85d7f1b40bc42b9ba6876091f22
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Thu Feb 8 01:47:46 2018 +0200
tdf#100784 macOS: Don't attempt to handle shortcuts via the menubar
... when it's hidden.
Change-Id: I7930afb8124dd552843512cd30bce4d82ade0c70
Reviewed-on: https://gerrit.libreoffice.org/49399
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 26f826467677..825edac6be6c 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -160,7 +160,8 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
// the main menu just beeps for an unknown or disabled key
equivalent
// and swallows the event wholesale
NSMenu* pMainMenu = [NSApp mainMenu];
- if( ! bHandled && (pMainMenu == nullptr || ! [pMainMenu
performKeyEquivalent: pEvent]) )
+ if( ! bHandled &&
+ (pMainMenu == nullptr || ! [NSMenu menuBarVisible] || !
[pMainMenu performKeyEquivalent: pEvent]) )
{
[[pKeyWin contentView] keyDown: pEvent];
bHandled = GetSalData()->maKeyEventAnswer[ pEvent ];
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
