diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-14 12:27:02 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-14 12:27:02 +0200 |
| commit | 6bd24577658c1e2fde21b14147b4ba964890afe1 (patch) | |
| tree | 2002796555a0fda4069f44b1a0b33282e4be4a94 /src/plugins/platforms/cocoa/qcocoabackingstore.h | |
| parent | 2161414cdf2790d39eeb25fc35e26c966708d4b8 (diff) | |
| parent | 08d6cb7673aa51bc0532d71db4134f4912e14769 (diff) | |
Merge remote-tracking branch 'origin/5.12.8' into 5.12
Change-Id: I3c060326bf24f31dda0fd6dd9ebf278da4c2fe46
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoabackingstore.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoabackingstore.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.h b/src/plugins/platforms/cocoa/qcocoabackingstore.h index b57deacb57..3d9dfd8359 100644 --- a/src/plugins/platforms/cocoa/qcocoabackingstore.h +++ b/src/plugins/platforms/cocoa/qcocoabackingstore.h @@ -47,6 +47,8 @@ #include <QScopedPointer> #include "qiosurfacegraphicsbuffer.h" +#include <unordered_map> + QT_BEGIN_NAMESPACE class QCocoaBackingStore : public QRasterBackingStore @@ -71,8 +73,9 @@ private: void redrawRoundedBottomCorners(CGRect) const; }; -class QCALayerBackingStore : public QCocoaBackingStore +class QCALayerBackingStore : public QObject, public QCocoaBackingStore { + Q_OBJECT public: QCALayerBackingStore(QWindow *window); ~QCALayerBackingStore(); @@ -119,6 +122,11 @@ private: QMacNotificationObserver m_backingPropertiesObserver; std::list<std::unique_ptr<GraphicsBuffer>> m_buffers; + + void flushSubWindow(QWindow *window); + std::unordered_map<QWindow*, std::unique_ptr<QCALayerBackingStore>> m_subWindowBackingstores; + void windowDestroyed(QObject *object); + bool m_clearSurfaceOnPaint = true; }; QT_END_NAMESPACE |