diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-08-24 14:34:52 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-09-01 02:42:38 +0000 |
| commit | ca14d84197a8489dff87a414dfdab6eccd4cb2f5 (patch) | |
| tree | 5102a025ca745bc150632f6c2fc066c8dcda5967 /src/plugins/platforms/cocoa/qcocoawindow.h | |
| parent | 1f9284b624f1ba3d6600195dd0c2596a40ffaee3 (diff) | |
macOS: Modernize masking of windows
Instead of masking window blitting via a CGImage mask, we use the window's
mask directly to intersect the region that we blit during flushing of the
QCocoaBackingStore. This approach also enables masking of child windows.
We now also support setting a mask for layer-backed views, by setting a
CAShapeLayer as the layer's mask.
The window shadow invalidation has been moved out of QNSView, as the view
should not be involved in that process. For layer-backed views, the shadow
is not invalidated as expected after the initial mask has been set, but
this bug has been left as a fix for a later stage as it requires more
research.
Change-Id: Ie0127d8df49d95b2d6144816b19559f3d3c95d13
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index 052d8f838c..3357f91bed 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -260,6 +260,8 @@ public: // for QNSView QCocoaMenuBar *m_menubar; NSCursor *m_windowCursor; + bool m_needsInvalidateShadow; + bool m_hasModalSession; bool m_frameStrutEventsEnabled; bool m_isExposed; |