diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-11-09 15:37:35 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-11-10 04:24:45 +0100 |
| commit | 5f2b53f13c40c31da21d8352312962bb97cb8c97 (patch) | |
| tree | 4113048d60fd449576ba69eef70701541a807c21 /src/plugins/platforms/cocoa/qcocoamenuloader.mm | |
| parent | 5b136abd21803988f96b9b66c992822efbef97ec (diff) | |
Cocoa: Allow CMD+H to hide the application when a tooltip is visible
Since native applications allow CMD+H to hide an application when the
tooltip is visible then we should do too. Other popup windows will
still block the call.
Pick-to: 5.15
Fixes: QTBUG-82626
Change-Id: Ieac86d6b3cb2152a3ba82d8bd850f13bfeedb7c8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoamenuloader.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuloader.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenuloader.mm b/src/plugins/platforms/cocoa/qcocoamenuloader.mm index 56e5b4bdee..ba37b40f5e 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuloader.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuloader.mm @@ -324,7 +324,8 @@ return [NSApp validateMenuItem:menuItem]; if (menuItem.action == @selector(hide:)) { - if (QCocoaIntegration::instance()->activePopupWindow()) + auto *w = QCocoaIntegration::instance()->activePopupWindow(); + if (w && (w->window()->type() != Qt::ToolTip)) return NO; return [NSApp validateMenuItem:menuItem]; } |