QShortCut: Check whether the menu is QPA-disabled

When climbing the menu hierarchy, it's sounder to
check whether the actual QPA menu is enabled. This
way we can trigger modifier-less shortcuts even in
submenus.

Task-number: QTBUG-38256
Task-number: QTBUG-42584
Change-Id: I13a27027306bce0f0732b05bf9469f3b77028f73
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>

2 files changed, 6 insertions, 0 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoamenu.h b/src/plugins/platforms/cocoa/qcocoamenu.h
index ad8821ca97..59807deb5a 100644
--- a/src/plugins/platforms/cocoa/qcocoamenu.h
+++ b/src/plugins/platforms/cocoa/qcocoamenu.h
@@ -58,6 +58,7 @@ public:
     void removeMenuItem(QPlatformMenuItem *menuItem);
     void syncMenuItem(QPlatformMenuItem *menuItem);
     void setEnabled(bool enabled);
+    bool isEnabled() const;
     void setVisible(bool visible);
     void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item);
     void dismiss();
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm
index fb11efb689..4fadc2f60a 100644
--- a/src/plugins/platforms/cocoa/qcocoamenu.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenu.mm
@@ -426,6 +426,11 @@ void QCocoaMenu::setEnabled(bool enabled)
     syncModalState(!m_enabled);
 }
 
+bool QCocoaMenu::isEnabled() const
+{
+    return [m_nativeItem isEnabled];
+}
+
 void QCocoaMenu::setVisible(bool visible)
 {
     [m_nativeItem setSubmenu:(visible ? m_nativeMenu : nil)];