From 39ba3049f01b30c9a99ad8bb8cd94e117d1c3c65 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周四, 28 12月 2023 20:54:27 +0800
Subject: [PATCH] Fix mistakes of quick module

---
 src/core/contexts/abstractwindowcontext.cpp |  127 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 112 insertions(+), 15 deletions(-)

diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 193cae2..2fdada5 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -3,10 +3,54 @@
 #include <QtGui/QPen>
 #include <QtGui/QPainter>
 #include <QtGui/QScreen>
+#include <memory>
 
 #include "qwkglobal_p.h"
 
 namespace QWK {
+
+    namespace {
+
+        class WinIdChangeEventFilter : public QObject {
+        public:
+            explicit WinIdChangeEventFilter(QObject *widget, AbstractWindowContext *ctx,
+                                            QObject *parent = nullptr)
+                : QObject(parent), ctx(ctx) {
+                widget->installEventFilter(this);
+            }
+
+        protected:
+            bool eventFilter(QObject *obj, QEvent *event) override {
+                Q_UNUSED(obj)
+                if (event->type() == QEvent::WinIdChange) {
+                    ctx->notifyWinIdChange();
+                }
+                return false;
+            }
+
+        protected:
+            AbstractWindowContext *ctx;
+        };
+
+        class WindowEventFilter : public QObject {
+        public:
+            explicit WindowEventFilter(QWindow *window, AbstractWindowContext *ctx,
+                                       QObject *parent = nullptr)
+                : QObject(parent), ctx(ctx), window(window) {
+                window->installEventFilter(this);
+            }
+
+        protected:
+            bool eventFilter(QObject *obj, QEvent *event) override {
+                return ctx->sharedDispatch(obj, event);
+            }
+
+        protected:
+            AbstractWindowContext *ctx;
+            QWindow *window;
+        };
+
+    }
 
     AbstractWindowContext::AbstractWindowContext() = default;
 
@@ -18,27 +62,16 @@
         }
         m_host = host;
         m_delegate.reset(delegate);
+        m_winIdChangeEventFilter = std::make_unique<WinIdChangeEventFilter>(host, this);
 
-        m_windowHandle = m_delegate->window(m_host);
+        m_windowHandle = m_delegate->hostWindow(m_host);
         if (m_windowHandle) {
             winIdChanged();
+            m_windowEventFilter = std::make_unique<WindowEventFilter>(m_windowHandle, this);
         }
     }
 
-    void AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &var) {
-        auto it = m_windowAttributes.find(key);
-        if (it.value() == var)
-            return;
 
-        auto newVar = var;
-        auto oldVar = it.value();
-        void *args[] = {
-            &const_cast<QString &>(key),
-            &newVar,
-            &oldVar,
-        };
-        virtual_hook(WindowAttributeChangedHook, args);
-    }
 
     bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
         Q_ASSERT(obj);
@@ -73,6 +106,15 @@
         if (m_titleBar == item) {
             return false;
         }
+
+        if (m_titleBar) {
+            // Since the title bar is changed, all items inside it should be dereferenced right away
+            for (auto &button : m_systemButtons) {
+                button = nullptr;
+            }
+            m_hitTestVisibleItems.clear();
+        }
+
         m_titleBar = item;
         return true;
     }
@@ -169,6 +211,10 @@
             }
 
             case RaiseWindowHook: {
+                if (!m_windowHandle)
+                    return;
+
+                m_delegate->setWindowVisible(m_host, true);
                 Qt::WindowStates state = m_delegate->getWindowState(m_host);
                 if (state & Qt::WindowMinimized) {
                     m_delegate->setWindowState(m_host, state & ~Qt::WindowMinimized);
@@ -198,10 +244,61 @@
 
     void AbstractWindowContext::notifyWinIdChange() {
         auto oldWindow = m_windowHandle;
-        m_windowHandle = m_delegate->window(m_host);
+        m_windowHandle = m_delegate->hostWindow(m_host);
         if (oldWindow == m_windowHandle)
             return;
+        m_windowEventFilter.reset();
         winIdChanged();
+        if (m_windowHandle) {
+            m_windowEventFilter = std::make_unique<WindowEventFilter>(m_windowHandle, this);
+
+            // Refresh window attributes
+            auto attributes = m_windowAttributes;
+            m_windowAttributes.clear();
+            for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+                if (!windowAttributeChanged(it.key(), it.value(), {})) {
+                    continue;
+                }
+                m_windowAttributes.insert(it.key(), it.value());
+            }
+        }
+    }
+
+    QVariant AbstractWindowContext::windowAttribute(const QString &key) const {
+        return m_windowAttributes.value(key);
+    }
+
+    bool AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &attribute) {
+        auto it = m_windowAttributes.find(key);
+        if (it == m_windowAttributes.end()) {
+            if (!attribute.isValid()) {
+                return true;
+            }
+            if (!m_windowHandle || !windowAttributeChanged(key, attribute, {})) {
+                return false;
+            }
+            m_windowAttributes.insert(key, attribute);
+            return true;
+        }
+
+        if (it.value() == attribute)
+            return true;
+        if (!m_windowHandle || !windowAttributeChanged(key, attribute, it.value())) {
+            return false;
+        }
+
+        if (attribute.isValid()) {
+            it.value() = attribute;
+        } else {
+            m_windowAttributes.erase(it);
+        }
+        return true;
+    }
+
+    bool AbstractWindowContext::windowAttributeChanged(const QString &key,
+                                                       const QVariant &attribute,
+                                                       const QVariant &oldAttribute) {
+        return false;
     }
 
 }

--
Gitblit v1.9.1