1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Respect window type when determining main window status

Browse Source 
Fixes: QTBUG-84405
Change-Id: I3fc6b15b07a81e7e7e417a5767c2853083c13516
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 1cd7cbf6179692fc824dc3ba15580372493a4355)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2020-06-05 12:50:43 +02:00 committed by Qt Cherry-pick Bot
parent c86c028efd
commit e54112b467
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/cocoa/qnswindow.mm
View File

@ -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