diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-06-05 12:50:43 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-06-10 04:08:10 +0000 |
| commit | f7f5919558a08e92db133580fff7b5cc3053a9ed (patch) | |
| tree | 9320b4cee28c85c50f135b4f928a4f6bcc944cc7 | |
| parent | b11508aa544d36fff2a973ee0429dbf765409a1f (diff) | |
macOS: Respect window type when determining main window status
Fixes: QTBUG-84405
Change-Id: I3fc6b15b07a81e7e7e417a5767c2853083c13516
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 1cd7cbf6179692fc824dc3ba15580372493a4355)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | src/plugins/platforms/cocoa/qnswindow.mm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm index 6b4e110af2..1a74fd73f8 100644 --- a/src/plugins/platforms/cocoa/qnswindow.mm +++ b/src/plugins/platforms/cocoa/qnswindow.mm @@ -227,14 +227,12 @@ static bool isMouseEvent(NSEvent *ev) - (BOOL)canBecomeMainWindow { - BOOL canBecomeMain = YES; // By default, windows can become the main window - // Windows with a transient parent (such as combobox popup windows) // cannot become the main window: if (!m_platformWindow || m_platformWindow->window()->transientParent()) - canBecomeMain = NO; + return NO; - return canBecomeMain; + return [super canBecomeMainWindow]; } - (BOOL)worksWhenModal |