summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa/qcocoawindow.mm
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-08-24 14:01:13 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-08-30 17:57:01 +0000
commitfefbed5eae9e1b2761da6a506874b0ccd42fd6a0 (patch)
tree94f657576f0bc607a3305a85bde30e6dda87453b /src/plugins/platforms/cocoa/qcocoawindow.mm
parent2a131b94db2af663f3d35a97c5e2224c3ba50c5d (diff)
macOS: Determine opaqueness and backgroundColor of NSWindow declaratively
Instead of imperatively trying to keep the logic consistent in many different call sites. Task-number: QTBUG-61909 Change-Id: I8d647690c47656f34673555a8a8aa3ec6ffc73d1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.mm')
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.mm9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 72beb2757a..f37c95aa77 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -749,17 +749,13 @@ void QCocoaWindow::setOpacity(qreal level)
return;
m_view.window.alphaValue = level;
- m_view.window.opaque = isOpaque();
}
void QCocoaWindow::setMask(const QRegion &region)
{
qCDebug(lcQpaCocoaWindow) << "QCocoaWindow::setMask" << window() << region;
- if (isContentView())
- m_view.window.backgroundColor = !region.isEmpty() ? [NSColor clearColor] : nil;
[qnsview_cast(m_view) setMaskRegion:&region];
- m_view.window.opaque = isOpaque();
}
bool QCocoaWindow::setKeyboardGrabEnabled(bool grab)
@@ -1318,11 +1314,6 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel)
nsWindow.restorable = NO;
nsWindow.level = windowLevel(flags);
- if (!isOpaque()) {
- nsWindow.backgroundColor = [NSColor clearColor];
- nsWindow.opaque = NO;
- }
-
if (shouldBePanel) {
// Qt::Tool windows hide on app deactivation, unless Qt::WA_MacAlwaysShowToolWindow is set
nsWindow.hidesOnDeactivate = ((type & Qt::Tool) == Qt::Tool) && !alwaysShowToolWindow();