From 59690b8ab4f3e4c2cea0467f40e858080943dd62 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周四, 14 12月 2023 20:45:33 +0800
Subject: [PATCH] tweak

---
 src/quick/quickwindowagent.cpp |   81 +++++++++++++++++++++-------------------
 1 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index aae49f7..2e69f76 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -1,17 +1,16 @@
 #include "quickwindowagent.h"
 #include "quickwindowagent_p.h"
 
-#include "quickitemdelegate_p.h"
-
 #include <QtQuick/QQuickWindow>
+#include <QtQuick/private/qquickanchors_p.h>
+
+#include "quickitemdelegate_p.h"
 
 namespace QWK {
 
-    QuickWindowAgentPrivate::QuickWindowAgentPrivate() {
-    }
+    QuickWindowAgentPrivate::QuickWindowAgentPrivate() = default;
 
-    QuickWindowAgentPrivate::~QuickWindowAgentPrivate() {
-    }
+    QuickWindowAgentPrivate::~QuickWindowAgentPrivate() = default;
 
     void QuickWindowAgentPrivate::init() {
     }
@@ -20,8 +19,7 @@
         : QuickWindowAgent(*new QuickWindowAgentPrivate(), parent) {
     }
 
-    QuickWindowAgent::~QuickWindowAgent() {
-    }
+    QuickWindowAgent::~QuickWindowAgent() = default;
 
     bool QuickWindowAgent::setup(QQuickWindow *window) {
         Q_ASSERT(window);
@@ -35,38 +33,14 @@
         }
 
         if (!d->setup(window, new QuickItemDelegate())) {
-            return true;
+            return false;
         }
         d->hostWindow = window;
+
+#ifdef Q_OS_WINDOWS
+        d->setupWindows10BorderWorkaround();
+#endif
         return true;
-    }
-
-    bool QuickWindowAgent::isHitTestVisible(QQuickItem *item) const {
-        Q_D(const QuickWindowAgent);
-        return d->context->isHitTestVisible(item);
-    }
-
-    void QuickWindowAgent::setHitTestVisible(QQuickItem *item, bool visible) {
-        Q_D(QuickWindowAgent);
-        d->context->setHitTestVisible(item, visible);
-    }
-
-    void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
-        Q_D(QuickWindowAgent);
-        d->context->setHitTestVisible(rect, visible);
-    }
-
-    QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
-        Q_D(const QuickWindowAgent);
-        return static_cast<QQuickItem *>(d->context->systemButton(button));
-    }
-
-    void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) {
-        Q_D(QuickWindowAgent);
-        if (!d->context->setSystemButton(button, item)) {
-            return;
-        }
-        Q_EMIT systemButtonChanged(button, item);
     }
 
     QQuickItem *QuickWindowAgent::titleBar() const {
@@ -82,8 +56,37 @@
         Q_EMIT titleBarWidgetChanged(item);
     }
 
+    QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
+        Q_D(const QuickWindowAgent);
+        return static_cast<QQuickItem *>(d->context->systemButton(button));
+    }
+
+    void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) {
+        Q_D(QuickWindowAgent);
+        if (!d->context->setSystemButton(button, item)) {
+            return;
+        }
+        Q_EMIT systemButtonChanged(button, item);
+    }
+
+    bool QuickWindowAgent::isHitTestVisible(const QQuickItem *item) const {
+        Q_D(const QuickWindowAgent);
+        return d->context->isHitTestVisible(item);
+    }
+
+    void QuickWindowAgent::setHitTestVisible_item(const QQuickItem *item, bool visible) {
+        Q_D(QuickWindowAgent);
+        d->context->setHitTestVisible(item, visible);
+    }
+
+    void QuickWindowAgent::setHitTestVisible_rect(const QRect &rect, bool visible) {
+        Q_D(QuickWindowAgent);
+        d->context->setHitTestVisible(rect, visible);
+    }
+
     QuickWindowAgent::QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent)
-        : CoreWindowAgent(d, parent) {
+        : WindowAgentBase(d, parent) {
         d.init();
     }
-}
+
+}
\ No newline at end of file

--
Gitblit v1.9.1