From c837319767bb609c6ec806336e49a347c77b11d3 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周五, 22 12月 2023 21:30:53 +0800
Subject: [PATCH] Add non-system-border option on Windows

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

diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index 58d52dd..52b1a8c 100644
--- a/src/widgets/widgetwindowagent_win.cpp
+++ b/src/widgets/widgetwindowagent_win.cpp
@@ -1,20 +1,23 @@
 #include "widgetwindowagent_p.h"
 
+#include <QWKCore/qwkconfig.h>
+#include <QWKCore/qwkglobal.h>
+
 #include <QtGui/QPainter>
 
-#include <QWKCore/private/eventobserver_p.h>
+#include <QWKCore/qwindowkit_windows.h>
+#include <QWKCore/private/nativeeventfilter_p.h>
 
 namespace QWK {
 
-    class WidgetBorderHandler : public QObject, public EventObserver {
-        Q_OBJECT
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+    class WidgetBorderHandler : public QObject, public NativeEventFilter {
     public:
-        explicit WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx,
-                                     QObject *parent = nullptr)
-            : QObject(parent), widget(widget), ctx(ctx) {
+        explicit WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx)
+            : QObject(ctx), widget(widget), ctx(ctx) {
             widget->installEventFilter(this);
 
-            ctx->addObserver(this);
+            ctx->installNativeEventFilter(this);
             updateGeometry();
         }
 
@@ -32,15 +35,29 @@
         }
 
     protected:
-        bool observe(QEvent *event) override {
-            switch (event->type()) {
-                case QEvent::UpdateRequest: {
+        bool nativeEventFilter(const QByteArray &eventType, void *message,
+                               QT_NATIVE_EVENT_RESULT_TYPE *result) override {
+            Q_UNUSED(eventType)
+            const auto msg = static_cast<const MSG *>(message);
+            switch (msg->message) {
+                case WM_DPICHANGED: {
+                    updateGeometry();
+                    break;
+                }
+
+                case WM_THEMECHANGED:
+                case WM_SYSCOLORCHANGE:
+                case WM_DWMCOLORIZATIONCOLORCHANGED: {
                     widget->update();
                     break;
                 }
 
-                case QEvent::ScreenChangeInternal: {
-                    updateGeometry();
+                case WM_SETTINGCHANGE: {
+                    if (!msg->wParam && msg->lParam &&
+                        std::wcscmp(reinterpret_cast<LPCWSTR>(msg->lParam), L"ImmersiveColorSet") ==
+                            0) {
+                        widget->update();
+                    }
                     break;
                 }
 
@@ -51,9 +68,11 @@
         }
 
         bool eventFilter(QObject *obj, QEvent *event) override {
+            Q_UNUSED(obj)
             switch (event->type()) {
                 case QEvent::Paint: {
-                    if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen))
+                    if (widget->windowState() &
+                        (Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen))
                         break;
 
                     auto paintEvent = static_cast<QPaintEvent *>(event);
@@ -67,7 +86,7 @@
                         &region,
                     };
                     ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook, args);
-                    return true;
+                    break;
                 }
 
                 case QEvent::WindowStateChange: {
@@ -90,15 +109,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, ctx);
+            std::ignore = new WidgetBorderHandler(hostWidget, ctx);
         }
+#endif
     }
 
 }
-
-#include "widgetwindowagent_win.moc"
\ No newline at end of file

--
Gitblit v1.9.1