From 0586c98f90866e4bc9f0dfe73aefb0a07c56697e Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 12 12月 2023 15:44:14 +0800
Subject: [PATCH] Add win10 border handler

---
 src/quick/quickwindowagent.cpp |   94 +++++++++++++++++++++++------------------------
 1 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 74a032b..747daf0 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -1,36 +1,41 @@
 #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>
 
+#ifdef Q_OS_WINDOWS
+#  include <QWKCore/private/win10borderhandler_p.h>
+#endif
+
+#include "quickitemdelegate_p.h"
+
 namespace QWK {
 
-    class BorderItem : public QQuickPaintedItem {
+    class BorderItem : public QQuickPaintedItem, public Win10BorderHandler {
         Q_OBJECT
-
     public:
-        explicit BorderItem(AbstractWindowContext *ctx, QQuickItem *parent = nullptr);
+        explicit BorderItem(QQuickItem *parent = nullptr);
         ~BorderItem() override;
 
-        void updateHeight();
+        void updateGeometry() override;
+        void requestUpdate() override;
 
+        bool isActive() const override;
+
+    public:
         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.
+    BorderItem::BorderItem(QQuickItem *parent)
+        : Win10BorderHandler(parent->window()), QQuickPaintedItem(parent) {
+        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();
@@ -38,45 +43,27 @@
         anchors->setLeft(parentPri->left());
         anchors->setRight(parentPri->right());
 
-        setZ(std::numeric_limits<qreal>::max());
+        setZ(10);
     }
 
     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::updateGeometry() {
+        setHeight(m_borderThickness);
+    }
+
+    void BorderItem::requestUpdate() {
+        update();
+    }
+
+    bool BorderItem::isActive() const {
+        return static_cast<QQuickWindow *>(m_window)->isActive();
     }
 
     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;
-        }
+        QRect rect(QPoint(0, 0), size().toSize());
+        QRegion region(rect);
+        Win10BorderHandler::paintBorder(*painter, rect, region);
     }
 
     QuickWindowAgentPrivate::QuickWindowAgentPrivate() {
@@ -86,7 +73,6 @@
     }
 
     void QuickWindowAgentPrivate::init() {
-        borderItem = std::make_unique<BorderItem>(context.get(), hostWindow->contentItem());
     }
 
     QuickWindowAgent::QuickWindowAgent(QObject *parent)
@@ -111,6 +97,18 @@
             return false;
         }
         d->hostWindow = window;
+
+#ifdef Q_OS_WINDOWS
+        // Install painting hook
+        if (bool needPaintBorder;
+            QMetaObject::invokeMethod(d->context.get(), "needWin10BorderHandler",
+                                      Qt::DirectConnection, Q_RETURN_ARG(bool, needPaintBorder)),
+            needPaintBorder) {
+            QMetaObject::invokeMethod(
+                d->context.get(), "setWin10BorderHandler", Qt::DirectConnection,
+                Q_ARG(Win10BorderHandler *, new BorderItem(window->contentItem())));
+        }
+#endif
         return true;
     }
 

--
Gitblit v1.9.1