From 3bde231e6d0b1c177c8c1fc4eccb6207d40aeec1 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 25 12月 2023 00:59:34 +0800
Subject: [PATCH] Test on MinGW

---
 src/widgets/widgetwindowagent_win.cpp |   64 +++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index ccac368..dc35a17 100644
--- a/src/widgets/widgetwindowagent_win.cpp
+++ b/src/widgets/widgetwindowagent_win.cpp
@@ -3,12 +3,16 @@
 #include <QtGui/QPainter>
 
 #include <QWKCore/qwindowkit_windows.h>
+#include <QWKCore/qwkconfig.h>
 #include <QWKCore/private/nativeeventfilter_p.h>
 
 namespace QWK {
 
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+
+    class WidgetBorderHandler;
+
     class WidgetBorderHandler : public QObject, public NativeEventFilter {
-        Q_OBJECT
     public:
         explicit WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx)
             : QObject(ctx), widget(widget), ctx(ctx) {
@@ -18,16 +22,21 @@
             updateGeometry();
         }
 
+        inline bool isNormalWindow() const {
+            return widget->windowState() &
+                   (Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen);
+        }
+
         void updateGeometry() {
-            if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen)) {
-                widget->setContentsMargins({});
-            } else {
+            if (isNormalWindow()) {
                 widget->setContentsMargins({
                     0,
                     ctx->property("borderThickness").toInt(),
                     0,
                     0,
                 });
+            } else {
+                widget->setContentsMargins({});
             }
         }
 
@@ -35,7 +44,7 @@
         bool nativeEventFilter(const QByteArray &eventType, void *message,
                                QT_NATIVE_EVENT_RESULT_TYPE *result) override {
             Q_UNUSED(eventType)
-            auto msg = reinterpret_cast<const MSG *>(message);
+            const auto msg = static_cast<const MSG *>(message);
             switch (msg->message) {
                 case WM_DPICHANGED: {
                     updateGeometry();
@@ -58,6 +67,16 @@
                     break;
                 }
 
+                case WM_PAINT: {
+                    // Let Qt paint first
+                    m_dispatcher->resume(eventType, message, result);
+
+                    // Upon receiving the WM_PAINT message, Qt will redraw the entire view, and we
+                    // must wait for it to finish redrawing before drawing this top border area
+                    ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook2, nullptr);
+                    return true;
+                }
+
                 default:
                     break;
             }
@@ -65,23 +84,23 @@
         }
 
         bool eventFilter(QObject *obj, QEvent *event) override {
+            Q_UNUSED(obj)
             switch (event->type()) {
-                case QEvent::Paint: {
-                    if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen))
-                        break;
-
-                    auto paintEvent = static_cast<QPaintEvent *>(event);
-                    auto rect = paintEvent->rect();
-                    auto region = paintEvent->region();
-
-                    QPainter painter(widget);
-                    void *args[] = {
-                        &painter,
-                        &rect,
-                        &region,
+                case QEvent::UpdateRequest: {
+                    // Friend class helping to call `event`
+                    class HackedWidget : public QWidget {
+                    public:
+                        friend class QWK::WidgetBorderHandler;
                     };
-                    ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook, args);
-                    break;
+
+                    // Let the widget paint first
+                    static_cast<HackedWidget *>(widget)->event(event);
+
+                    // Due to the timer or user action, Qt will redraw some regions spontaneously,
+                    // even if there is no WM_PAINT message, we must wait for it to finish redrawing
+                    // and then update the upper border area
+                    ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook2, nullptr);
+                    return true;
                 }
 
                 case QEvent::WindowStateChange: {
@@ -104,15 +123,16 @@
         QWidget *widget;
         AbstractWindowContext *ctx;
     };
+#endif
 
     void WidgetWindowAgentPrivate::setupWindows10BorderWorkaround() {
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
         // Install painting hook
         auto ctx = context.get();
         if (ctx->property("needBorderPainter").toBool()) {
             std::ignore = new WidgetBorderHandler(hostWidget, ctx);
         }
+#endif
     }
 
 }
-
-#include "widgetwindowagent_win.moc"
\ No newline at end of file

--
Gitblit v1.9.1