From 9619357769518e277237812e82d7c32d38cb20e6 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 17 12月 2023 00:23:05 +0800
Subject: [PATCH] Optimize Qt and Cocoa context

---
 src/widgets/widgetwindowagent.cpp |   69 ++++++++++++++++++----------------
 1 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index 9726e4b..af15481 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -1,15 +1,17 @@
 #include "widgetwindowagent.h"
 #include "widgetwindowagent_p.h"
 
+#include <QtGui/QtEvents>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>
+
 #include "widgetitemdelegate_p.h"
 
 namespace QWK {
 
-    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
-    }
+    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() = default;
 
-    WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() {
-    }
+    WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() = default;
 
     void WidgetWindowAgentPrivate::init() {
     }
@@ -18,8 +20,7 @@
         : WidgetWindowAgent(*new WidgetWindowAgentPrivate(), parent) {
     }
 
-    WidgetWindowAgent::~WidgetWindowAgent() {
-    }
+    WidgetWindowAgent::~WidgetWindowAgent() = default;
 
     bool WidgetWindowAgent::setup(QWidget *w) {
         Q_ASSERT(w);
@@ -28,61 +29,65 @@
         }
 
         Q_D(WidgetWindowAgent);
-        if (d->host) {
+        if (d->hostWidget) {
             return false;
         }
 
-        std::ignore = w->winId(); // Make sure the window handle is created
-        if (!d->setup(w->windowHandle(), new WidgetItemDelegate())) {
-            return true;
+        w->setAttribute(Qt::WA_DontCreateNativeAncestors);
+        w->setAttribute(Qt::WA_NativeWindow);
+
+        if (!d->setup(w, new WidgetItemDelegate())) {
+            return false;
         }
-        d->host = w;
+        d->hostWidget = w;
+
+#ifdef Q_OS_WINDOWS
+        d->setupWindows10BorderWorkaround();
+#endif
         return true;
     }
 
-    bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const {
+    QWidget *WidgetWindowAgent::titleBar() const {
         Q_D(const WidgetWindowAgent);
-        return d->m_eventHandler->isHitTestVisible(w);
+        return static_cast<QWidget *>(d->context->titleBar());
     }
 
-    void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
+    void WidgetWindowAgent::setTitleBar(QWidget *w) {
         Q_D(WidgetWindowAgent);
-        d->m_eventHandler->setHitTestVisible(w, visible);
+        if (!d->context->setTitleBar(w)) {
+            return;
+        }
+#ifdef Q_OS_MACOS
+        d->setupMacOSTitleBar(w);
+#endif
+        Q_EMIT titleBarWidgetChanged(w);
     }
 
-    void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
-        Q_D(WidgetWindowAgent);
-        d->m_eventHandler->setHitTestVisible(rect, visible);
-    }
-
-    QWidget *WidgetWindowAgent::systemButton(CoreWindowAgent::SystemButton button) const {
+    QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
         Q_D(const WidgetWindowAgent);
-        return static_cast<QWidget *>(d->m_eventHandler->systemButton(button));
+        return static_cast<QWidget *>(d->context->systemButton(button));
     }
 
-    void WidgetWindowAgent::setSystemButton(CoreWindowAgent::SystemButton button, QWidget *w) {
+    void WidgetWindowAgent::setSystemButton(SystemButton button, QWidget *w) {
         Q_D(WidgetWindowAgent);
-        if (!d->m_eventHandler->setSystemButton(button, w)) {
+        if (!d->context->setSystemButton(button, w)) {
             return;
         }
         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->m_eventHandler->titleBar());
+        return d->context->isHitTestVisible(w);
     }
 
-    void WidgetWindowAgent::setTitleBar(QWidget *w) {
+    void WidgetWindowAgent::setHitTestVisible(const QWidget *w, bool visible) {
         Q_D(WidgetWindowAgent);
-        if (!d->m_eventHandler->setTitleBar(w)) {
-            return;
-        }
-        Q_EMIT titleBarWidgetChanged(w);
+        d->context->setHitTestVisible(w, visible);
     }
 
     WidgetWindowAgent::WidgetWindowAgent(WidgetWindowAgentPrivate &d, QObject *parent)
-        : CoreWindowAgent(d, parent) {
+        : WindowAgentBase(d, parent) {
         d.init();
     }
 }

--
Gitblit v1.9.1