From bdbe25895fefbbcf7a940d98695b56999cd1ae9e Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周四, 07 12月 2023 17:05:12 +0800
Subject: [PATCH] Add override context factories

---
 src/widgets/widgetwindowagent.cpp |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index 252213e..b183951 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -2,6 +2,7 @@
 #include "widgetwindowagent_p.h"
 
 #include "widgetitemdelegate_p.h"
+#include "widgetwindowcontext_p.h"
 
 namespace QWK {
 
@@ -12,6 +13,10 @@
     }
 
     void WidgetWindowAgentPrivate::init() {
+    }
+
+    AbstractWindowContext *WidgetWindowAgentPrivate::createContext() const {
+        return new WidgetWindowContext();
     }
 
     WidgetWindowAgent::WidgetWindowAgent(QObject *parent)
@@ -32,35 +37,35 @@
             return false;
         }
 
-        std::ignore = w->winId(); // Make sure the window handle is created
-        if (!d->setup(w->windowHandle(), new WidgetItemDelegate())) {
+        w->setAttribute(Qt::WA_DontCreateNativeAncestors);
+        w->setAttribute(Qt::WA_NativeWindow);
+
+        if (!d->setup(w, new WidgetItemDelegate())) {
             return false;
         }
         d->hostWidget = w;
         return true;
     }
 
-    bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const {
+    const QWidget *WidgetWindowAgent::titleBar() const {
         Q_D(const WidgetWindowAgent);
-        return d->context->isHitTestVisible(w);
+        return static_cast<const QWidget *>(d->context->titleBar());
     }
 
-    void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
+    void WidgetWindowAgent::setTitleBar(const QWidget *w) {
         Q_D(WidgetWindowAgent);
-        d->context->setHitTestVisible(w, visible);
+        if (!d->context->setTitleBar(w)) {
+            return;
+        }
+        Q_EMIT titleBarWidgetChanged(w);
     }
 
-    void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
-        Q_D(WidgetWindowAgent);
-        d->context->setHitTestVisible(rect, visible);
-    }
-
-    QWidget *WidgetWindowAgent::systemButton(CoreWindowAgent::SystemButton button) const {
+    const QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
         Q_D(const WidgetWindowAgent);
-        return static_cast<QWidget *>(d->context->systemButton(button));
+        return static_cast<const QWidget *>(d->context->systemButton(button));
     }
 
-    void WidgetWindowAgent::setSystemButton(CoreWindowAgent::SystemButton button, QWidget *w) {
+    void WidgetWindowAgent::setSystemButton(SystemButton button, const QWidget *w) {
         Q_D(WidgetWindowAgent);
         if (!d->context->setSystemButton(button, w)) {
             return;
@@ -68,17 +73,19 @@
         Q_EMIT systemButtonChanged(button, w);
     }
 
-    QWidget *WidgetWindowAgent::titleBar() const {
+    bool WidgetWindowAgent::isHitTestVisible(const QWidget *w) const {
         Q_D(const WidgetWindowAgent);
-        return static_cast<QWidget *>(d->context->titleBar());
+        return d->context->isHitTestVisible(w);
     }
 
-    void WidgetWindowAgent::setTitleBar(QWidget *w) {
+    void WidgetWindowAgent::setHitTestVisible(const QWidget *w, bool visible) {
         Q_D(WidgetWindowAgent);
-        if (!d->context->setTitleBar(w)) {
-            return;
-        }
-        Q_EMIT titleBarWidgetChanged(w);
+        d->context->setHitTestVisible(w, visible);
+    }
+
+    void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
+        Q_D(WidgetWindowAgent);
+        d->context->setHitTestVisible(rect, visible);
     }
 
     WidgetWindowAgent::WidgetWindowAgent(WidgetWindowAgentPrivate &d, QObject *parent)

--
Gitblit v1.9.1