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

macOS: Simplify and correct style mask determination

Browse Source 
This function had accumulated a fair bit of accidental
complexity over the years.

- No early returns, make sure to preserve fullscreen
  state for all windows.

- Use windowIsPopupType() directly to set borderless
  for Qt::Popup (but not Qt::Tool).

- Handle Qt::Tool explicitly.

- Deduplicate Qt::CustomizeWindowMask handling.

- Remove case that used the absence of NSResizableWindowMask
  to remove the maximize button. Maximize is now
  disabled elsewhere (setWindowZoomButton). All windows
  now get NSResizableWindowMask by default.

- Qt::ForeignWindow now gets a standard window style
  mask instead of NSBorderlessWindowMask. The old
  code did not handle this case and left the mask
  value unmodified.

Change-Id: I56499e9f05c3f481b5a96e0507da2fb195f207fa
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Morten Johan Sørvig 2017-08-02 00:07:15 +02:00
parent 12c5264d9a
commit 8b3a120a3b
1 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -485,52 +485,31 @@ NSInteger QCocoaWindow::windowLevel(Qt::WindowFlags flags)
NSUInteger QCocoaWindow::windowStyleMask(Qt::WindowFlags flags) NSUInteger QCocoaWindow::windowStyleMask(Qt::WindowFlags flags)
{ {
Qt::WindowType type = static_cast<Qt::WindowType>(int(flags & Qt::WindowType_Mask)); const Qt::WindowType type = static_cast<Qt::WindowType>(int(flags & Qt::WindowType_Mask));
NSInteger styleMask = NSBorderlessWindowMask; const bool frameless = (flags & Qt::FramelessWindowHint) || windowIsPopupType(type);
if (flags & Qt::FramelessWindowHint)
return styleMask; // Select base window type.
if ((type & Qt::Popup) == Qt::Popup) { NSUInteger styleMask = frameless ? NSBorderlessWindowMask : NSResizableWindowMask;
if (!windowIsPopupType(type)) {
styleMask = NSUtilityWindowMask | NSResizableWindowMask; if (frameless) {
if (!(flags & Qt::CustomizeWindowHint)) { // No further customizations for frameless since there are no window decorations.
styleMask |= NSClosableWindowMask | NSMiniaturizableWindowMask | NSTitledWindowMask; } else if (flags & Qt::CustomizeWindowHint) {
} else { if (flags & Qt::WindowTitleHint)
if (flags & Qt::WindowTitleHint) styleMask |= NSTitledWindowMask;
styleMask |= NSTitledWindowMask; if (flags & Qt::WindowCloseButtonHint)
if (flags & Qt::WindowCloseButtonHint) styleMask |= NSClosableWindowMask;
styleMask |= NSClosableWindowMask; if (flags & Qt::WindowMinimizeButtonHint)
if (flags & Qt::WindowMinimizeButtonHint) styleMask |= NSMiniaturizableWindowMask;
styleMask |= NSMiniaturizableWindowMask;
}
}
} else { } else {
if (type == Qt::Window && !(flags & Qt::CustomizeWindowHint)) { styleMask |= NSClosableWindowMask | NSTitledWindowMask;
styleMask = (NSResizableWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSTitledWindowMask);
} else if (type == Qt::Dialog) { if (type != Qt::Dialog)
if (flags & Qt::CustomizeWindowHint) { styleMask |= NSMiniaturizableWindowMask;
if (flags & Qt::WindowMaximizeButtonHint)
styleMask = NSResizableWindowMask;
if (flags & Qt::WindowTitleHint)
styleMask |= NSTitledWindowMask;
if (flags & Qt::WindowCloseButtonHint)
styleMask |= NSClosableWindowMask;
if (flags & Qt::WindowMinimizeButtonHint)
styleMask |= NSMiniaturizableWindowMask;
} else {
styleMask = NSResizableWindowMask | NSClosableWindowMask | NSTitledWindowMask;
}
} else {
if (flags & Qt::WindowMaximizeButtonHint)
styleMask |= NSResizableWindowMask;
if (flags & Qt::WindowTitleHint)
styleMask |= NSTitledWindowMask;
if (flags & Qt::WindowCloseButtonHint)
styleMask |= NSClosableWindowMask;
if (flags & Qt::WindowMinimizeButtonHint)
styleMask |= NSMiniaturizableWindowMask;
}
} }
if (type == Qt::Tool)
styleMask |= NSUtilityWindowMask;
if (m_drawContentBorderGradient) if (m_drawContentBorderGradient)
styleMask |= NSTexturedBackgroundWindowMask; styleMask |= NSTexturedBackgroundWindowMask;