Cocoa: Fix disabled minimize button on main windows
Task-number: QTBUG-30775 Change-Id: Idec64f2cc6181e6889498171ead676d33c66e537 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
parent
56cc59110a
commit
38bf6da7dd
@ -406,7 +406,7 @@ NSUInteger QCocoaWindow::windowStyleMask(Qt::WindowFlags flags)
|
|||||||
Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint;
|
Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint;
|
||||||
if (flags == Qt::Window) {
|
if (flags == Qt::Window) {
|
||||||
styleMask = (NSResizableWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSTitledWindowMask);
|
styleMask = (NSResizableWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSTitledWindowMask);
|
||||||
} else if (flags & Qt::Dialog) {
|
} else if ((flags & Qt::Dialog) == Qt::Dialog) {
|
||||||
if (window()->modality() == Qt::NonModal)
|
if (window()->modality() == Qt::NonModal)
|
||||||
styleMask = NSResizableWindowMask | NSClosableWindowMask | NSTitledWindowMask;
|
styleMask = NSResizableWindowMask | NSClosableWindowMask | NSTitledWindowMask;
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user