summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa
diff options
context:
space:
mode:
authorDaiwei Li <daiweili@suitabletech.com>2013-08-13 15:58:41 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-15 01:30:54 +0200
commit3e4c9cb3d6177c8feb4d57f900f118596f7b3c18 (patch)
tree39e1aa2ee06f045e3a5dc398ef0489a4c11becce /src/plugins/platforms/cocoa
parent1044f23deec0e6bee6455fee9cd8793b3fb65c60 (diff)
Cocoa: Set window title after setting window flags if window has border
A QWindow should keep its title after removing and restoring the frame, so set it if we are setting window flags that include a frame. Task-number: QTBUG-32978 Change-Id: I0fe1b651eac05a210b06ec4f7f6fb78f2536834d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.mm3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 1126315126..26869d4b5f 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -486,6 +486,9 @@ void QCocoaWindow::setWindowFlags(Qt::WindowFlags flags)
[m_nsWindow setStyleMask:styleMask];
[m_nsWindow setLevel:level];
setWindowShadow(flags);
+ if (!(styleMask & NSBorderlessWindowMask)) {
+ setWindowTitle(window()->title());
+ }
}
m_windowFlags = flags;