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

macOS: Merge QCocoaWindow::setWindowShadow into its only caller 

Change-Id: I14149231d12658c59e3f9f87f2943ccdfbea4d43
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
bb10
Tor Arne Vestbø 2017-06-23 13:55:55 +02:00
parent bb918db849
commit 67ee72f314
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/cocoa/qcocoawindow.h
View File

@ -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

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

@ -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());