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.cpp |   40 +++++++++++++++++++++++++---------------
 1 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 5329634..679a9ee 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -2,22 +2,29 @@
 
 namespace QWK {
 
-    AbstractWindowContext::AbstractWindowContext(QWindow *window, WindowItemDelegate *delegate)
-        : m_windowHandle(window), m_delegate(delegate) {
+    AbstractWindowContext::AbstractWindowContext()
+        : m_host(nullptr), m_delegate(nullptr), m_windowHandle(nullptr) {
     }
 
-    AbstractWindowContext::~AbstractWindowContext() {
-    }
+    AbstractWindowContext::~AbstractWindowContext() = default;
 
-    void AbstractWindowContext::setupWindow(QWindow *window) {
-        Q_ASSERT(window);
-        if (!window) {
-            return;
+    bool AbstractWindowContext::setup(QObject *host, WindowItemDelegate *delegate) {
+        if (!host || !delegate) {
+            return false;
         }
-        m_windowHandle = window;
+
+        auto windowHandle = delegate->hostWindow(host);
+        if (!windowHandle) {
+            return false;
+        }
+
+        m_host = host;
+        m_delegate.reset(delegate);
+        m_windowHandle = windowHandle;
+        return true;
     }
 
-    bool AbstractWindowContext::setHitTestVisible(QObject *obj, bool visible) {
+    bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
         Q_ASSERT(obj);
         if (!obj) {
             return false;
@@ -47,7 +54,7 @@
     }
 
     bool AbstractWindowContext::setSystemButton(CoreWindowAgent::SystemButton button,
-                                                QObject *obj) {
+                                                const QObject *obj) {
         Q_ASSERT(obj);
         Q_ASSERT(button != CoreWindowAgent::Unknown);
         if (!obj || (button == CoreWindowAgent::Unknown)) {
@@ -61,7 +68,7 @@
         return true;
     }
 
-    bool AbstractWindowContext::setTitleBar(QObject *item) {
+    bool AbstractWindowContext::setTitleBar(const QObject *item) {
         Q_ASSERT(item);
         if (!item) {
             return false;
@@ -99,7 +106,7 @@
                 continue;
             }
             if (m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
-                *button = CoreWindowAgent::WindowIcon;
+                *button = static_cast<CoreWindowAgent::SystemButton>(i);
                 return true;
             }
         }
@@ -124,6 +131,10 @@
             return false;
         }
 
+        if (!titleBarRect.contains(pos)) {
+            return false;
+        }
+
         for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
             auto currentButton = m_systemButtons[i];
             if (currentButton && m_delegate->isVisible(currentButton) &&
@@ -140,10 +151,9 @@
             }
         }
 
-        if (hitTestShape().contains(pos)) {
+        if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) {
             return false;
         }
-
         return true;
     }
 

--
Gitblit v1.9.1