From 29901fc2a97eedd3c914f807d1819c9ea7e69973 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 25 12月 2023 17:53:34 +0800
Subject: [PATCH] Optimize Windows 10 border handling

---
 src/widgets/widgetwindowagent_win.cpp |   90 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index 3eb9f1e..9e49d38 100644
--- a/src/widgets/widgetwindowagent_win.cpp
+++ b/src/widgets/widgetwindowagent_win.cpp
@@ -1,5 +1,7 @@
 #include "widgetwindowagent_p.h"
 
+#include <QtCore/QDebug>
+#include <QtCore/QDateTime>
 #include <QtGui/QPainter>
 
 #include <QWKCore/qwindowkit_windows.h>
@@ -7,26 +9,37 @@
 
 namespace QWK {
 
-    class WidgetBorderHandler : public QObject, public NativeEventFilter {
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+
+    class WidgetBorderHandler;
+
+    class WidgetBorderHandler : public QObject, public NativeEventFilter, public SharedEventFilter {
     public:
         explicit WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx)
             : QObject(ctx), widget(widget), ctx(ctx) {
             widget->installEventFilter(this);
 
             ctx->installNativeEventFilter(this);
+            ctx->installSharedEventFilter(this);
+
             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({});
             }
         }
 
@@ -56,6 +69,16 @@
                     }
                     break;
                 }
+#  if 0
+                case WM_ACTIVATE: {
+                    if (LOWORD(msg->wParam) == WA_INACTIVE) {
+                        // 绐楀彛澶卞幓婵�娲荤姸鎬�
+                    } else {
+                        // 绐楀彛琚縺娲�
+                    }
+                    break;
+                }
+#  endif
 
                 default:
                     break;
@@ -63,24 +86,56 @@
             return false;
         }
 
+        bool sharedEventFilter(QObject *obj, QEvent *event) override {
+            Q_UNUSED(obj)
+
+            auto window = widget->windowHandle();
+            if (event->type() == QEvent::Expose) {
+                // Qt will absolutely send a QExposeEvent to the QWindow when it receives a
+                // WM_PAINT message. When the control flow enters the expose handler, Qt must
+                // have already called BeginPaint() and it's the best time for us to draw the
+                // top border.
+                auto ee = static_cast<QExposeEvent *>(event);
+                if (isNormalWindow() && window->isExposed() && !ee->region().isNull()) {
+                    // Friend class helping to call `event`
+                    class HackedWindow : public QWindow {
+                    public:
+                        friend class QWK::WidgetBorderHandler;
+                    };
+
+                    // Let Qt paint first
+                    static_cast<HackedWindow *>(window)->event(event);
+
+                    // 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;
+                }
+            }
+            return false;
+        }
+
         bool eventFilter(QObject *obj, QEvent *event) override {
+            Q_UNUSED(obj)
             switch (event->type()) {
-                case QEvent::Paint: {
-                    if (widget->windowState() & (Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen))
+                case QEvent::UpdateRequest: {
+                    if (!isNormalWindow())
                         break;
 
-                    auto paintEvent = static_cast<QPaintEvent *>(event);
-                    auto rect = paintEvent->rect();
-                    auto region = paintEvent->region();
-
-                    QPainter painter(widget);
-                    void *args[] = {
-                        &painter,
-                        &rect,
-                        &region,
+                    // 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: {
@@ -111,5 +166,6 @@
             std::ignore = new WidgetBorderHandler(hostWidget, ctx);
         }
     }
+#endif
 
 }

--
Gitblit v1.9.1