AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cocoa: Properly unhide views after they're moved to their own window

Browse Source 
Task-number: QTBUG-32221
Change-Id: I12a475c7a5abdc5ba4d7359d694dd62ea97e67c4
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Gabriel de Dietrich 2013-10-02 16:19:37 +02:00 committed by The Qt Project
parent 4bcef03a8d
commit 5bc02ad665
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/cocoa/qcocoawindow.mm
View File

@ -369,9 +369,12 @@ void QCocoaWindow::setVisible(bool visible)
[(NSPanel *)m_nsWindow setWorksWhenModal:YES];
}
}
} else {
[m_contentView setHidden:NO];
}
// In some cases, e.g. QDockWidget, the content view is hidden before moving to its own
// Cocoa window, and then shown again. Therefore, we test for the view being hidden even
// if it's attached to an NSWindow.
if ([m_contentView isHidden])
[m_contentView setHidden:NO];
} else {
// qDebug() << "close" << this;
if (m_nsWindow) {