whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Move NSWindow creation properties into createNSWindow() 

Allows the block in recreateWindowIfNeeded() that calls createNSWindow()
to focus on how to (re)parent windows/views, while createNSWindow() takes
care of how to set up the window. Dynamic properties that may change later
on are handled in e.g. setWindowFlags().

Change-Id: Ice0e44d004bd2608b2b54e6dde0f404a1e07dc10
Reviewed-by: Mike Krus <mike.krus@kdab.com>
bb10
Tor Arne Vestbø 2016-12-12 14:19:38 +01:00
parent 88788667a0
commit d19bd1feb6
1 changed files with 39 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -994,6 +994,9 @@ void QCocoaWindow::setWindowFlags(Qt::WindowFlags flags)
setWindowZoomButton(flags);
}
if (m_nsWindow)
m_nsWindow.ignoresMouseEvents = flags & Qt::WindowTransparentForInput;
m_windowFlags = flags;
}
@ -1620,15 +1623,8 @@ void QCocoaWindow::recreateWindowIfNeeded()
}
// Set properties after the window has been made a child NSWindow
m_nsWindow.styleMask = NSBorderlessWindowMask;
m_nsWindow.hasShadow = NO;
m_nsWindow.level = NSNormalWindowLevel;
NSWindowCollectionBehavior collectionBehavior =
NSWindowCollectionBehaviorManaged | NSWindowCollectionBehaviorIgnoresCycle
| NSWindowCollectionBehaviorFullScreenAuxiliary;
m_nsWindow.animationBehavior = NSWindowAnimationBehaviorNone;
m_nsWindow.collectionBehavior = collectionBehavior;
setCocoaGeometry(windowGeometry());
setWindowFlags(window()->flags());
} else {
// Child windows have no NSWindow, link the NSViews instead.
if ([m_view superview])
@ -1645,9 +1641,6 @@ void QCocoaWindow::recreateWindowIfNeeded()
[m_view setHidden:!window()->isVisible()];
}
m_nsWindow.ignoresMouseEvents =
(window()->flags() & Qt::WindowTransparentForInput) == Qt::WindowTransparentForInput;
const qreal opacity = qt_window_private(window())->opacity;
if (!qFuzzyCompare(opacity, qreal(1.0)))
setOpacity(opacity);
@ -1715,62 +1708,49 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBeChildNSWindow, bool sh
Qt::WindowType type = window()->type();
Qt::WindowFlags flags = window()->flags();
NSUInteger styleMask;
if (shouldBeChildNSWindow) {
styleMask = NSBorderlessWindowMask;
} else {
styleMask = windowStyleMask(flags);
}
QCocoaNSWindow *createdWindow = 0;
// Create NSWindow
Class windowClass = shouldBePanel ? [QNSPanel class] : [QNSWindow class];
NSUInteger styleMask = shouldBeChildNSWindow ? NSBorderlessWindowMask : windowStyleMask(flags);
QCocoaNSWindow *window = [[windowClass alloc] initWithContentRect:frame
screen:cocoaScreen->nativeScreen() styleMask:styleMask qPlatformWindow:this];
window.restorable = NO;
window.level = shouldBeChildNSWindow ? NSNormalWindowLevel : windowLevel(flags);
if (!isOpaque()) {
window.backgroundColor = [NSColor clearColor];
window.opaque = NO;
}
Q_ASSERT(!(shouldBePanel && shouldBeChildNSWindow));
// Use NSPanel for popup-type windows. (Popup, Tool, ToolTip, SplashScreen)
// and dialogs
if (shouldBePanel) {
QNSPanel *panel = [[QNSPanel alloc] initWithContentRect:frame screen:cocoaScreen->nativeScreen()
styleMask: styleMask qPlatformWindow:this];
// Qt::Tool windows hide on app deactivation, unless Qt::WA_MacAlwaysShowToolWindow is set
window.hidesOnDeactivate = ((type & Qt::Tool) == Qt::Tool) &&
!qt_mac_resolveOption(false, QPlatformWindow::window(), "_q_macAlwaysShowToolWindow", "");
if ((type & Qt::Popup) == Qt::Popup)
[panel setHasShadow:YES];
// Make popup windows show on the same desktop as the parent full-screen window
window.collectionBehavior = NSWindowCollectionBehaviorFullScreenAuxiliary;
// Qt::Tool windows hide on app deactivation, unless Qt::WA_MacAlwaysShowToolWindow is set.
QVariant showWithoutActivating = QPlatformWindow::window()->property("_q_macAlwaysShowToolWindow");
bool shouldHideOnDeactivate = ((type & Qt::Tool) == Qt::Tool) &&
!(showWithoutActivating.isValid() && showWithoutActivating.toBool());
[panel setHidesOnDeactivate: shouldHideOnDeactivate];
// Make popup windows show on the same desktop as the parent full-screen window.
[panel setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary];
if ((type & Qt::Popup) == Qt::Popup)
[panel setAnimationBehavior:NSWindowAnimationBehaviorUtilityWindow];
createdWindow = panel;
} else {
createdWindow = [[QNSWindow alloc] initWithContentRect:frame screen:cocoaScreen->nativeScreen()
styleMask: styleMask qPlatformWindow:this];
if ((type & Qt::Popup) == Qt::Popup) {
window.hasShadow = YES;
window.animationBehavior = NSWindowAnimationBehaviorUtilityWindow;
}
} else if (shouldBeChildNSWindow) {
window.collectionBehavior =
NSWindowCollectionBehaviorManaged
| NSWindowCollectionBehaviorIgnoresCycle
| NSWindowCollectionBehaviorFullScreenAuxiliary;
window.hasShadow = NO;
window.animationBehavior = NSWindowAnimationBehaviorNone;
}
if ([createdWindow respondsToSelector:@selector(setRestorable:)])
[createdWindow setRestorable: NO];
// Persist modality so we can detect changes later on
m_windowModality = QPlatformWindow::window()->modality();
NSInteger level = windowLevel(flags);
[createdWindow setLevel:level];
applyContentBorderThickness(window);
// OpenGL surfaces can be ordered either above(default) or below the NSWindow.
// When ordering below the window must be tranclucent and have a clear background color.
static GLint openglSourfaceOrder = qt_mac_resolveOption(1, "QT_MAC_OPENGL_SURFACE_ORDER");
bool isTranslucent = window()->format().alphaBufferSize() > 0
|| (surface()->supportsOpenGL() && openglSourfaceOrder == -1);
if (isTranslucent) {
[createdWindow setBackgroundColor:[NSColor clearColor]];
[createdWindow setOpaque:NO];
}
m_windowModality = window()->modality();
applyContentBorderThickness(createdWindow);
return createdWindow;
return window;
}
void QCocoaWindow::removeMonitor()