diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2013-04-05 15:09:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-08 09:30:19 +0200 |
| commit | 53cee4a37ab4215db08329c1764b92b57ed16723 (patch) | |
| tree | 6d0548cf269accd28238a32d3879f23d1f2bbdbd /src | |
| parent | 00202e15fd73057f396c00cabf3c965d7694c365 (diff) | |
Mac: a dialog should have a titlebar by default
Change 595deca5 for QTBUG-22316 resulted in having titlebars only on
modal dialogs.
Change-Id: Ic23c957e0e95cf567d90831e105cc402465df982
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index e74f9dcfe0..b75f822e2d 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -395,8 +395,11 @@ NSUInteger QCocoaWindow::windowStyleMask(Qt::WindowFlags flags) Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint; if (flags == Qt::Window) { styleMask = (NSResizableWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSTitledWindowMask); - } else if ((flags & Qt::Dialog) && (window()->modality() != Qt::NonModal)) { - styleMask = NSResizableWindowMask | NSTitledWindowMask; + } else if (flags & Qt::Dialog) { + if (window()->modality() == Qt::NonModal) + styleMask = NSResizableWindowMask | NSClosableWindowMask | NSTitledWindowMask; + else + styleMask = NSResizableWindowMask | NSTitledWindowMask; } else if (!(flags & Qt::FramelessWindowHint)) { if ((flags & Qt::Dialog) || (flags & Qt::WindowMaximizeButtonHint)) styleMask |= NSResizableWindowMask; |