From 29104c85db53e7c0c0aaf3fe78f84b737fce4886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
Date: Fri, 17 Nov 2017 12:28:55 +0100
Subject: =?UTF-8?q?Cocoa:=20Disable=20=E2=80=9CHide=E2=80=9D=20menu=20item?=
 =?UTF-8?q?=20on=20open=20popups?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow native behavior and disable ⌘H and the “Hide”
menu item if there are any open popup windows.

Task-number: QTBUG-58727
Change-Id: Iad38cc5cce29e0081613417c53b154ae0f05857e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
---
 src/plugins/platforms/cocoa/qcocoamenuloader.mm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/platforms/cocoa/qcocoamenuloader.mm b/src/plugins/platforms/cocoa/qcocoamenuloader.mm
index 0d9bb5009d..b986833f6d 100644
--- a/src/plugins/platforms/cocoa/qcocoamenuloader.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenuloader.mm
@@ -43,6 +43,7 @@
 #include "qcocoahelpers.h"
 #include "qcocoamenubar.h"
 #include "qcocoamenuitem.h"
+#include "qcocoaintegration.h"
 
 #include <QtCore/private/qcore_mac_p.h>
 #include <QtCore/private/qthread_p.h>
@@ -343,10 +344,13 @@
 
 - (BOOL)validateMenuItem:(NSMenuItem*)menuItem
 {
-    if ([menuItem action] == @selector(hide:)
-        || [menuItem action] == @selector(hideOtherApplications:)
+    if ([menuItem action] == @selector(hideOtherApplications:)
         || [menuItem action] == @selector(unhideAllApplications:)) {
         return [NSApp validateMenuItem:menuItem];
+    } else if ([menuItem action] == @selector(hide:)) {
+        if (QCocoaIntegration::instance()->activePopupWindow())
+            return NO;
+        return [NSApp validateMenuItem:menuItem];
     } else if ([menuItem tag]) {
         QCocoaMenuItem *cocoaItem = reinterpret_cast<QCocoaMenuItem *>([menuItem tag]);
         return cocoaItem->isEnabled();
-- 
cgit v1.2.3