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 |   93 +++++-----------------------------------------
 1 files changed, 10 insertions(+), 83 deletions(-)

diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 74a032b..2e69f76 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -1,100 +1,25 @@
 #include "quickwindowagent.h"
 #include "quickwindowagent_p.h"
-#include "quickitemdelegate_p.h"
 
 #include <QtQuick/QQuickWindow>
-#include <QtQuick/QQuickPaintedItem>
-#include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquickanchors_p.h>
+
+#include "quickitemdelegate_p.h"
 
 namespace QWK {
 
-    class BorderItem : public QQuickPaintedItem {
-        Q_OBJECT
+    QuickWindowAgentPrivate::QuickWindowAgentPrivate() = default;
 
-    public:
-        explicit BorderItem(AbstractWindowContext *ctx, QQuickItem *parent = nullptr);
-        ~BorderItem() override;
-
-        void updateHeight();
-
-        void paint(QPainter *painter) override;
-
-        void itemChange(ItemChange change, const ItemChangeData &data) override;
-
-    private:
-        AbstractWindowContext *context;
-    };
-
-    BorderItem::BorderItem(AbstractWindowContext *ctx, QQuickItem *parent) : QQuickPaintedItem(parent), context(ctx) {
-        setAntialiasing(true); // ### FIXME: do we need to enable or disable this?
-        setMipmap(true); // ### FIXME: do we need to enable or disable this?
-        setFillColor({}); // Will improve the performance a little bit.
-        setOpaquePainting(true); // Will also improve the performance, we don't draw semi-transparent borders of course.
-
-        auto parentPri = QQuickItemPrivate::get(parent);
-        auto anchors = QQuickItemPrivate::get(this)->anchors();
-        anchors->setTop(parentPri->top());
-        anchors->setLeft(parentPri->left());
-        anchors->setRight(parentPri->right());
-
-        setZ(std::numeric_limits<qreal>::max());
-    }
-
-    BorderItem::~BorderItem() = default;
-
-    void BorderItem::updateHeight() {
-        bool native = false;
-        quint32 thickness = 0;
-        void *args[] = { &native, &thickness };
-        context->virtual_hook(AbstractWindowContext::QueryBorderThicknessHook, &args);
-        setHeight(thickness);
-    }
-
-    void BorderItem::paint(QPainter *painter) {
-        auto rect = QRect{ QPoint{ 0, 0}, size().toSize() };
-        auto region = QRegion{ rect };
-        void *args[] = {
-            painter,
-            &rect,
-            &region
-        };
-        context->virtual_hook(AbstractWindowContext::DrawBordersHook, args);
-    }
-
-    void BorderItem::itemChange(ItemChange change, const ItemChangeData &data) {
-        QQuickPaintedItem::itemChange(change, data);
-        switch (change) {
-            case ItemSceneChange:
-                if (data.window) {
-                    connect(data.window, &QQuickWindow::activeChanged, this, [this](){ update(); });
-                }
-                Q_FALLTHROUGH();
-            case ItemVisibleHasChanged:
-            case ItemDevicePixelRatioHasChanged:
-                updateHeight();
-                break;
-            default:
-                break;
-        }
-    }
-
-    QuickWindowAgentPrivate::QuickWindowAgentPrivate() {
-    }
-
-    QuickWindowAgentPrivate::~QuickWindowAgentPrivate() {
-    }
+    QuickWindowAgentPrivate::~QuickWindowAgentPrivate() = default;
 
     void QuickWindowAgentPrivate::init() {
-        borderItem = std::make_unique<BorderItem>(context.get(), hostWindow->contentItem());
     }
 
     QuickWindowAgent::QuickWindowAgent(QObject *parent)
         : QuickWindowAgent(*new QuickWindowAgentPrivate(), parent) {
     }
 
-    QuickWindowAgent::~QuickWindowAgent() {
-    }
+    QuickWindowAgent::~QuickWindowAgent() = default;
 
     bool QuickWindowAgent::setup(QQuickWindow *window) {
         Q_ASSERT(window);
@@ -111,6 +36,10 @@
             return false;
         }
         d->hostWindow = window;
+
+#ifdef Q_OS_WINDOWS
+        d->setupWindows10BorderWorkaround();
+#endif
         return true;
     }
 
@@ -160,6 +89,4 @@
         d.init();
     }
 
-}
-
-#include "quickwindowagent.moc"
\ No newline at end of file
+}
\ No newline at end of file

--
Gitblit v1.9.1