diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-11-04 16:08:08 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-05 17:37:05 +0100 |
| commit | a199a87ad5452938482291ba5e2995e220678f7d (patch) | |
| tree | 758ab2cf7db60383de44ffa4041377967c55711b /src/plugins | |
| parent | f2720a806e399b47bf7575686484eac0a85c6b1b (diff) | |
Cocoa: Don't hide views when reparenting
Commit a2bdda8e3ba32 was meant for creation only. We should not
hide views on our own, particularly when Qt had not asked for that.
Task-number: QTBUG-33581
Change-Id: Ib35fc78a27be1498f80aabd385e7a2185475b949
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 565594a98a..228ef9d484 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -713,7 +713,10 @@ WId QCocoaWindow::winId() const void QCocoaWindow::setParent(const QPlatformWindow *parentWindow) { // recreate the window for compatibility + bool unhideAfterRecreate = parentWindow && !m_contentViewIsToBeEmbedded && ![m_contentView isHidden]; recreateWindow(parentWindow); + if (unhideAfterRecreate) + [m_contentView setHidden:NO]; setCocoaGeometry(geometry()); } |