From c3c6647e7888b7dbe9d9d22fb77bf08104a3653c Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 11 12月 2023 02:14:32 +0800
Subject: [PATCH] refactor

---
 src/core/contexts/abstractwindowcontext.cpp |   75 +++++++++++++++++++++++--------------
 1 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 2e32d25..71431ff 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -2,22 +2,36 @@
 
 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;
+
+        if (!setupHost()) {
+            m_host = nullptr;
+            m_delegate = nullptr;
+            m_windowHandle = nullptr;
+            return false;
+        }
+        return true;
     }
 
-    bool AbstractWindowContext::setHitTestVisible(QObject *obj, bool visible) {
+    bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
         Q_ASSERT(obj);
         if (!obj) {
             return false;
@@ -46,11 +60,11 @@
         return true;
     }
 
-    bool AbstractWindowContext::setSystemButton(CoreWindowAgent::SystemButton button,
-                                                QObject *obj) {
+    bool AbstractWindowContext::setSystemButton(WindowAgentBase::SystemButton button,
+                                                const QObject *obj) {
         Q_ASSERT(obj);
-        Q_ASSERT(button != CoreWindowAgent::Unknown);
-        if (!obj || (button == CoreWindowAgent::Unknown)) {
+        Q_ASSERT(button != WindowAgentBase::Unknown);
+        if (!obj || (button == WindowAgentBase::Unknown)) {
             return false;
         }
 
@@ -61,7 +75,7 @@
         return true;
     }
 
-    bool AbstractWindowContext::setTitleBar(QObject *item) {
+    bool AbstractWindowContext::setTitleBar(const QObject *item) {
         Q_ASSERT(item);
         if (!item) {
             return false;
@@ -74,9 +88,7 @@
         return true;
     }
 
-    void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
-        // ?
-    }
+    void AbstractWindowContext::showSystemMenu(const QPoint &pos){Q_UNUSED(pos)}
 
     QRegion AbstractWindowContext::hitTestShape() const {
         if (hitTestVisibleShapeDirty) {
@@ -90,16 +102,16 @@
     }
 
     bool AbstractWindowContext::isInSystemButtons(const QPoint &pos,
-                                                  CoreWindowAgent::SystemButton *button) const {
-        *button = CoreWindowAgent::Unknown;
-        for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
+                                                  WindowAgentBase::SystemButton *button) const {
+        *button = WindowAgentBase::Unknown;
+        for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
             auto currentButton = m_systemButtons[i];
             if (!currentButton || !m_delegate->isVisible(currentButton) ||
                 !m_delegate->isEnabled(currentButton)) {
                 continue;
             }
             if (m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
-                *button = CoreWindowAgent::WindowIcon;
+                *button = static_cast<WindowAgentBase::SystemButton>(i);
                 return true;
             }
         }
@@ -124,27 +136,34 @@
             return false;
         }
 
-        for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
+        if (!titleBarRect.contains(pos)) {
+            return false;
+        }
+
+        for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
             auto currentButton = m_systemButtons[i];
             if (currentButton && m_delegate->isVisible(currentButton) &&
                 m_delegate->isEnabled(currentButton) &&
                 m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
-                return true;
+                return false;
             }
         }
 
         for (auto widget : m_hitTestVisibleItems) {
             if (widget && m_delegate->isVisible(widget) && m_delegate->isEnabled(widget) &&
                 m_delegate->mapGeometryToScene(widget).contains(pos)) {
-                return true;
+                return false;
             }
         }
 
-        if (hitTestShape().contains(pos)) {
-            return true;
+        if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) {
+            return false;
         }
+        return true;
+    }
 
-        return false;
+    QObject *AbstractWindowContext::target() const {
+        return m_host;
     }
 
 }
\ No newline at end of file

--
Gitblit v1.9.1