From 2452f5958272d50981ab89ff843d2fa715d33957 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周四, 14 12月 2023 21:23:25 +0800
Subject: [PATCH] add macos titlebar

---
 src/quick/quickwindowagent.cpp |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 7fc72f5..2e69f76 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -2,16 +2,15 @@
 #include "quickwindowagent_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,18 +33,22 @@
         }
 
         if (!d->setup(window, new QuickItemDelegate())) {
-            return true;
+            return false;
         }
         d->hostWindow = window;
+
+#ifdef Q_OS_WINDOWS
+        d->setupWindows10BorderWorkaround();
+#endif
         return true;
     }
 
-    const QQuickItem *QuickWindowAgent::titleBar() const {
+    QQuickItem *QuickWindowAgent::titleBar() const {
         Q_D(const QuickWindowAgent);
-        return static_cast<const QQuickItem *>(d->context->titleBar());
+        return static_cast<QQuickItem *>(d->context->titleBar());
     }
 
-    void QuickWindowAgent::setTitleBar(const QQuickItem *item) {
+    void QuickWindowAgent::setTitleBar(QQuickItem *item) {
         Q_D(QuickWindowAgent);
         if (!d->context->setTitleBar(item)) {
             return;
@@ -54,12 +56,12 @@
         Q_EMIT titleBarWidgetChanged(item);
     }
 
-    const QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
+    QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
         Q_D(const QuickWindowAgent);
-        return static_cast<const QQuickItem *>(d->context->systemButton(button));
+        return static_cast<QQuickItem *>(d->context->systemButton(button));
     }
 
-    void QuickWindowAgent::setSystemButton(SystemButton button, const QQuickItem *item) {
+    void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) {
         Q_D(QuickWindowAgent);
         if (!d->context->setSystemButton(button, item)) {
             return;
@@ -72,12 +74,12 @@
         return d->context->isHitTestVisible(item);
     }
 
-    void QuickWindowAgent::setHitTestVisible(const QQuickItem *item, bool visible) {
+    void QuickWindowAgent::setHitTestVisible_item(const QQuickItem *item, bool visible) {
         Q_D(QuickWindowAgent);
         d->context->setHitTestVisible(item, visible);
     }
 
-    void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
+    void QuickWindowAgent::setHitTestVisible_rect(const QRect &rect, bool visible) {
         Q_D(QuickWindowAgent);
         d->context->setHitTestVisible(rect, visible);
     }
@@ -86,4 +88,5 @@
         : WindowAgentBase(d, parent) {
         d.init();
     }
-}
+
+}
\ No newline at end of file

--
Gitblit v1.9.1