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/widgets/widgetwindowagent.cpp |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index e7068fb..8fa28a7 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);
@@ -39,28 +40,35 @@
             return false;
         }
         d->hostWidget = w;
+
+#ifdef Q_OS_WINDOWS
+        d->setupWindows10BorderWorkaround();
+#endif
         return true;
     }
 
-    const QWidget *WidgetWindowAgent::titleBar() const {
+    QWidget *WidgetWindowAgent::titleBar() const {
         Q_D(const WidgetWindowAgent);
-        return static_cast<const QWidget *>(d->context->titleBar());
+        return static_cast<QWidget *>(d->context->titleBar());
     }
 
-    void WidgetWindowAgent::setTitleBar(const QWidget *w) {
+    void WidgetWindowAgent::setTitleBar(QWidget *w) {
         Q_D(WidgetWindowAgent);
         if (!d->context->setTitleBar(w)) {
             return;
         }
+#ifdef Q_OS_MACOS
+        d->setupMacOSTitleBar(w);
+#endif
         Q_EMIT titleBarWidgetChanged(w);
     }
 
-    const QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
+    QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
         Q_D(const WidgetWindowAgent);
-        return static_cast<const QWidget *>(d->context->systemButton(button));
+        return static_cast<QWidget *>(d->context->systemButton(button));
     }
 
-    void WidgetWindowAgent::setSystemButton(SystemButton button, const QWidget *w) {
+    void WidgetWindowAgent::setSystemButton(SystemButton button, QWidget *w) {
         Q_D(WidgetWindowAgent);
         if (!d->context->setSystemButton(button, w)) {
             return;
@@ -84,7 +92,7 @@
     }
 
     WidgetWindowAgent::WidgetWindowAgent(WidgetWindowAgentPrivate &d, QObject *parent)
-        : CoreWindowAgent(d, parent) {
+        : WindowAgentBase(d, parent) {
         d.init();
     }
 }

--
Gitblit v1.9.1