diff options
author | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2012-10-09 10:52:44 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-15 10:18:31 +0200 |
commit | 58add50eb010daeb7427f76b90b3ecae7ab75a59 (patch) | |
tree | 8fbd047a184a75f46f50c1c60d2602eff44d5aa2 /src/plugins/platforms/cocoa/qcocoawindow.mm | |
parent | 6343a46bc5160baf9e7dd79e43419ee1be52d505 (diff) |
QPlatformWindow: change API for QPlatformWindow::setWindowFlags
The current implementation requests the platform window to set
as many of the flags it can, and return the same flags with the
unsupported flags removed.
The problem with this approach is that the platform window is created
as late as possible, so a call to QWindow::setWindowFlags would in
many (most?) cases never be forwarded to the platform window (instead,
the platform window is responsible to check the current window flags
upon creation). As such, the filtering would never be done.
Looking at the current set of plugins, most of them also seems to
ignore this protocol, returning the flags unfiltered.
This patch suggests removing the return value from
QPlatformWindow::setWindowFlags. This will at least be consistent, so
that setting/getting flags would produce the same result independent of
delayed window creation. If needed, we can later add new API to
QPlatformIntegration or QPlatformWindow for querying supported window
flags.
Change-Id: I9c759b5f9fab5ebed764a982f77fe19881118875
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 26161b106e..f4a4936c28 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -387,7 +387,7 @@ void QCocoaWindow::setWindowShadow(Qt::WindowFlags flags) [m_nsWindow setHasShadow:(keepShadow ? YES : NO)]; } -Qt::WindowFlags QCocoaWindow::setWindowFlags(Qt::WindowFlags flags) +void QCocoaWindow::setWindowFlags(Qt::WindowFlags flags) { if (m_nsWindow) { NSUInteger styleMask = windowStyleMask(flags); @@ -398,7 +398,6 @@ Qt::WindowFlags QCocoaWindow::setWindowFlags(Qt::WindowFlags flags) } m_windowFlags = flags; - return m_windowFlags; } Qt::WindowState QCocoaWindow::setWindowState(Qt::WindowState state) |