From fe50d30edcc31618905ec3e3dc39c8b78cee49db Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: 周二, 19 12月 2023 18:09:23 +0800
Subject: [PATCH] minor tweaks

---
 src/widgets/widgetwindowagent.cpp |  105 ++++++++++++++++++++++++++++++++--------------------
 1 files changed, 64 insertions(+), 41 deletions(-)

diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index 1bf0b4e..a15a7ed 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -1,15 +1,38 @@
 #include "widgetwindowagent.h"
 #include "widgetwindowagent_p.h"
 
+#include <QtGui/QtEvents>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>
+
 #include "widgetitemdelegate_p.h"
 
 namespace QWK {
 
-    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
-    }
+    class WidgetWinIdChangeEventFilter : public QObject {
+    public:
+        explicit WidgetWinIdChangeEventFilter(QWidget *widget, AbstractWindowContext *ctx)
+            : QObject(ctx), widget(widget), ctx(ctx) {
+            widget->installEventFilter(this);
+        }
 
-    WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() {
-    }
+    protected:
+        bool eventFilter(QObject *obj, QEvent *event) override {
+            Q_UNUSED(obj)
+            if (event->type() == QEvent::WinIdChange) {
+                ctx->notifyWinIdChange();
+            }
+            return false;
+        }
+
+    protected:
+        QWidget *widget;
+        AbstractWindowContext *ctx;
+    };
+
+    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() = default;
+
+    WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() = default;
 
     void WidgetWindowAgentPrivate::init() {
     }
@@ -18,8 +41,7 @@
         : WidgetWindowAgent(*new WidgetWindowAgentPrivate(), parent) {
     }
 
-    WidgetWindowAgent::~WidgetWindowAgent() {
-    }
+    WidgetWindowAgent::~WidgetWindowAgent() = default;
 
     bool WidgetWindowAgent::setup(QWidget *w) {
         Q_ASSERT(w);
@@ -32,57 +54,58 @@
             return false;
         }
 
-        std::ignore = w->winId(); // Make sure the window handle is created
-        if (!d->setup(w->windowHandle(), new WidgetItemDelegate())) {
-            return false;
-        }
+        w->setAttribute(Qt::WA_DontCreateNativeAncestors);
+        w->setAttribute(Qt::WA_NativeWindow);
+
+        d->setup(w, new WidgetItemDelegate());
         d->hostWidget = w;
+
+#ifdef Q_OS_WINDOWS
+        d->setupWindows10BorderWorkaround();
+#endif
+        std::ignore = new WidgetWinIdChangeEventFilter(w, d->context.get());
+
         return true;
-    }
-
-    bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const {
-        Q_D(const WidgetWindowAgent);
-        return d->eventHandler->isHitTestVisible(w);
-    }
-
-    void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
-        Q_D(WidgetWindowAgent);
-        d->eventHandler->setHitTestVisible(w, visible);
-    }
-
-    void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
-        Q_D(WidgetWindowAgent);
-        d->eventHandler->setHitTestVisible(rect, visible);
-    }
-
-    QWidget *WidgetWindowAgent::systemButton(CoreWindowAgent::SystemButton button) const {
-        Q_D(const WidgetWindowAgent);
-        return static_cast<QWidget *>(d->eventHandler->systemButton(button));
-    }
-
-    void WidgetWindowAgent::setSystemButton(CoreWindowAgent::SystemButton button, QWidget *w) {
-        Q_D(WidgetWindowAgent);
-        if (!d->eventHandler->setSystemButton(button, w)) {
-            return;
-        }
-        Q_EMIT systemButtonChanged(button, w);
     }
 
     QWidget *WidgetWindowAgent::titleBar() const {
         Q_D(const WidgetWindowAgent);
-        return static_cast<QWidget *>(d->eventHandler->titleBar());
+        return static_cast<QWidget *>(d->context->titleBar());
     }
 
     void WidgetWindowAgent::setTitleBar(QWidget *w) {
         Q_D(WidgetWindowAgent);
-        if (!d->eventHandler->setTitleBar(w)) {
+        if (!d->context->setTitleBar(w)) {
             return;
         }
         Q_EMIT titleBarWidgetChanged(w);
     }
 
+    QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
+        Q_D(const WidgetWindowAgent);
+        return static_cast<QWidget *>(d->context->systemButton(button));
+    }
+
+    void WidgetWindowAgent::setSystemButton(SystemButton button, QWidget *w) {
+        Q_D(WidgetWindowAgent);
+        if (!d->context->setSystemButton(button, w)) {
+            return;
+        }
+        Q_EMIT systemButtonChanged(button, w);
+    }
+
+    bool WidgetWindowAgent::isHitTestVisible(const QWidget *w) const {
+        Q_D(const WidgetWindowAgent);
+        return d->context->isHitTestVisible(w);
+    }
+
+    void WidgetWindowAgent::setHitTestVisible(const QWidget *w, bool visible) {
+        Q_D(WidgetWindowAgent);
+        d->context->setHitTestVisible(w, visible);
+    }
+
     WidgetWindowAgent::WidgetWindowAgent(WidgetWindowAgentPrivate &d, QObject *parent)
-        : CoreWindowAgent(d, parent) {
+        : WindowAgentBase(d, parent) {
         d.init();
     }
 }

--
Gitblit v1.9.1