From 1a1f26d9e4ab6a4fe51baa78e40c4cdf3f402bcf Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周四, 07 12月 2023 14:27:00 +0800
Subject: [PATCH] Add context factory

---
 src/core/contexts/abstractwindowcontext_p.h |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index a92d91d..a73f7c4 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -16,24 +16,24 @@
     class QWK_CORE_EXPORT AbstractWindowContext : public QObject {
         Q_OBJECT
     public:
-        AbstractWindowContext(QWindow *window, WindowItemDelegate *delegate);
+        AbstractWindowContext();
         ~AbstractWindowContext() override;
 
     public:
-        virtual bool setup() = 0;
+        virtual bool setup(QObject *host, WindowItemDelegate *delegate);
 
+        inline QObject *host() const;
         inline QWindow *window() const;
-        void setupWindow(QWindow *window);
 
-        inline bool isHitTestVisible(QObject *obj) const;
-        bool setHitTestVisible(QObject *obj, bool visible);
+        inline bool isHitTestVisible(const QObject *obj) const;
+        bool setHitTestVisible(const QObject *obj, bool visible);
         bool setHitTestVisible(const QRect &rect, bool visible);
 
-        inline QObject *systemButton(CoreWindowAgent::SystemButton button) const;
-        bool setSystemButton(CoreWindowAgent::SystemButton button, QObject *obj);
+        inline const QObject *systemButton(CoreWindowAgent::SystemButton button) const;
+        bool setSystemButton(CoreWindowAgent::SystemButton button, const QObject *obj);
 
-        inline QObject *titleBar() const;
-        bool setTitleBar(QObject *obj);
+        inline const QObject *titleBar() const;
+        bool setTitleBar(const QObject *obj);
 
         void showSystemMenu(const QPoint &pos);
 
@@ -42,34 +42,39 @@
         bool isInTitleBarDraggableArea(const QPoint &pos) const;
 
     protected:
-        QWindow *m_windowHandle;
+        QObject *m_host;
         std::unique_ptr<WindowItemDelegate> m_delegate;
+        QWindow *m_windowHandle;
 
-        QSet<QObject *> m_hitTestVisibleItems;
+        QSet<const QObject *> m_hitTestVisibleItems;
         QList<QRect> m_hitTestVisibleRects;
 
-        QObject *m_titleBar{};
-        std::array<QObject *, CoreWindowAgent::NumSystemButton> m_systemButtons{};
+        const QObject *m_titleBar{};
+        std::array<const QObject *, CoreWindowAgent::NumSystemButton> m_systemButtons{};
 
         // Cached shape
         mutable bool hitTestVisibleShapeDirty{};
         mutable QRegion hitTestVisibleShape;
     };
 
+    inline QObject *AbstractWindowContext::host() const {
+        return m_host;
+    }
+
     inline QWindow *AbstractWindowContext::window() const {
         return m_windowHandle;
     }
 
-    inline bool AbstractWindowContext::isHitTestVisible(QObject *obj) const {
+    inline bool AbstractWindowContext::isHitTestVisible(const QObject *obj) const {
         return m_hitTestVisibleItems.contains(obj);
     }
 
-    inline QObject *
+    inline const QObject *
         AbstractWindowContext::systemButton(CoreWindowAgent::SystemButton button) const {
         return m_systemButtons[button];
     }
 
-    inline QObject *AbstractWindowContext::titleBar() const {
+    inline const QObject *AbstractWindowContext::titleBar() const {
         return m_titleBar;
     }
 

--
Gitblit v1.9.1