summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.h1
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.mm13
2 files changed, 3 insertions, 11 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h
index 2a25eb912c..98c74c07f3 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@@ -153,7 +153,6 @@ public:
NSInteger windowLevel(Qt::WindowFlags flags);
NSUInteger windowStyleMask(Qt::WindowFlags flags);
- void setWindowShadow(Qt::WindowFlags flags);
void setWindowZoomButton(Qt::WindowFlags flags);
#ifndef QT_NO_OPENGL
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 21fda31946..6c92751e9b 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -541,15 +541,6 @@ NSUInteger QCocoaWindow::windowStyleMask(Qt::WindowFlags flags)
return styleMask;
}
-void QCocoaWindow::setWindowShadow(Qt::WindowFlags flags)
-{
- if (!isContentView())
- return;
-
- bool keepShadow = !(flags & Qt::NoDropShadowWindowHint);
- m_view.window.hasShadow = keepShadow;
-}
-
void QCocoaWindow::setWindowZoomButton(Qt::WindowFlags flags)
{
if (!isContentView())
@@ -575,7 +566,9 @@ void QCocoaWindow::setWindowFlags(Qt::WindowFlags flags)
m_view.window.styleMask = windowStyleMask(flags);
m_inSetStyleMask = false;
m_view.window.level = this->windowLevel(flags);
- setWindowShadow(flags);
+
+ m_view.window.hasShadow = !(flags & Qt::NoDropShadowWindowHint);
+
if (!(flags & Qt::FramelessWindowHint))
setWindowTitle(window()->title());