From adc91610761971a86a8ecca83017236eeffebb3d Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周四, 07 3月 2024 16:12:35 +0800
Subject: [PATCH] Fix quick

---
 src/quick/quickwindowagent_win.cpp |  107 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 71 insertions(+), 36 deletions(-)

diff --git a/src/quick/quickwindowagent_win.cpp b/src/quick/quickwindowagent_win.cpp
index 8e57584..a47f4c0 100644
--- a/src/quick/quickwindowagent_win.cpp
+++ b/src/quick/quickwindowagent_win.cpp
@@ -1,37 +1,44 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
 #include "quickwindowagent_p.h"
 
 #include <QtQuick/QQuickPaintedItem>
 #include <QtQuick/private/qquickitem_p.h>
 
-#include <QWKCore/private/eventobserver_p.h>
+#include <QWKCore/qwindowkit_windows.h>
+#include <QWKCore/private/windows10borderhandler_p.h>
 
 namespace QWK {
 
-    class BorderItem : public QQuickPaintedItem, public EventObserver {
-        Q_OBJECT
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
+
+    class BorderItem : public QQuickPaintedItem, public Windows10BorderHandler {
     public:
         explicit BorderItem(QQuickItem *parent, AbstractWindowContext *context);
         ~BorderItem() override;
 
-        void updateGeometry();
+        void updateGeometry() override;
 
     public:
         void paint(QPainter *painter) override;
         void itemChange(ItemChange change, const ItemChangeData &data) override;
 
     protected:
-        bool observe(QEvent *event) override;
+        bool sharedEventFilter(QObject *obj, QEvent *event) override;
 
-        AbstractWindowContext *context;
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        volatile bool needPaint = false;
 
     private:
-        void _q_windowActivityChanged();
+        void _q_afterSynchronizing();
+#  endif
     };
 
     BorderItem::BorderItem(QQuickItem *parent, AbstractWindowContext *context)
-        : QQuickPaintedItem(parent), context(context) {
-        setAntialiasing(true);   // ### FIXME: do we need to enable or disable this?
-        setMipmap(true);         // ### FIXME: do we need to enable or disable this?
+        : QQuickPaintedItem(parent), Windows10BorderHandler(context) {
+        setAntialiasing(true);   // We need anti-aliasing to give us better result.
         setFillColor({});        // Will improve the performance a little bit.
         setOpaquePainting(true); // Will also improve the performance, we don't draw
                                  // semi-transparent borders of course.
@@ -42,29 +49,53 @@
         anchors->setLeft(parentPri->left());
         anchors->setRight(parentPri->right());
 
-        setZ(10);
+        setZ(std::numeric_limits<qreal>::max()); // Make sure our fake border always above
+                                                 // everything in the window.
 
-        context->addObserver(this);
-        connect(window(), &QQuickWindow::activeChanged, this,
-                &BorderItem::_q_windowActivityChanged);
-        updateGeometry();
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        connect(window(), &QQuickWindow::afterSynchronizing, this,
+                &BorderItem::_q_afterSynchronizing, Qt::DirectConnection);
+#  endif
+
+        // First update
+        if (context->windowId()) {
+            setupNecessaryAttributes();
+        }
+        BorderItem::updateGeometry();
     }
 
     BorderItem::~BorderItem() = default;
 
     void BorderItem::updateGeometry() {
-        setHeight(context->property("borderThickness").toInt());
+        setHeight(borderThickness());
+        setVisible(isNormalWindow());
     }
 
     void BorderItem::paint(QPainter *painter) {
-        QRect rect(QPoint(0, 0), size().toSize());
-        QRegion region(rect);
-        void *args[] = {
-            painter,
-            &rect,
-            &region,
-        };
-        context->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook, args);
+        Q_UNUSED(painter)
+
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        if (auto api = window()->rendererInterface()->graphicsApi();
+            !(api == QSGRendererInterface::Direct3D11
+
+#    if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+              || api == QSGRendererInterface::Direct3D12
+#    endif
+              )) {
+#  endif
+            QRect rect(QPoint(0, 0), size().toSize());
+            QRegion region(rect);
+            void *args[] = {
+                painter,
+                &rect,
+                &region,
+            };
+            ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook, args);
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        } else {
+            needPaint = true;
+        }
+#  endif
     }
 
     void BorderItem::itemChange(ItemChange change, const ItemChangeData &data) {
@@ -80,31 +111,35 @@
         }
     }
 
-    bool BorderItem::observe(QEvent *event) {
-        switch (event->type()) {
-            case QEvent::UpdateRequest: {
-                update();
-                break;
-            }
+    bool BorderItem::sharedEventFilter(QObject *obj, QEvent *event) {
+        Q_UNUSED(obj)
 
+        switch (event->type()) {
+            case QEvent::WindowStateChange: {
+                updateGeometry();
+            }
             default:
                 break;
         }
-        return false;
+        return Windows10BorderHandler::sharedEventFilter(obj, event);
     }
 
-    void BorderItem::_q_windowActivityChanged() {
-        update();
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    void BorderItem::_q_afterSynchronizing() {
+        if (needPaint) {
+            needPaint = false;
+            drawBorder();
+        }
     }
+#  endif
 
     void QuickWindowAgentPrivate::setupWindows10BorderWorkaround() {
         // Install painting hook
         auto ctx = context.get();
-        if (ctx->property("needBorderPainter").toBool()) {
+        if (ctx->windowAttribute(QStringLiteral("win10-border-needed")).toBool()) {
             std::ignore = new BorderItem(hostWindow->contentItem(), ctx);
         }
     }
+#endif
 
 }
-
-#include "quickwindowagent_win.moc"
\ No newline at end of file

--
Gitblit v1.9.1