From 8b72eabae325c34d8eab1544203993015cc91741 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 18 12月 2023 00:54:51 +0800
Subject: [PATCH] Add win32 winIdChange workaround

---
 src/widgets/widgetwindowagent.cpp |   94 ++++++++---------------------------------------
 1 files changed, 16 insertions(+), 78 deletions(-)

diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index ea8f6df..a15a7ed 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -9,81 +9,30 @@
 
 namespace QWK {
 
-    class WidgetBorderHandler : public QObject {
+    class WidgetWinIdChangeEventFilter : public QObject {
     public:
-        WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx)
-            : widget(widget), ctx(ctx), m_thickness(0) {
-            updateThickness();
+        explicit WidgetWinIdChangeEventFilter(QWidget *widget, AbstractWindowContext *ctx)
+            : QObject(ctx), widget(widget), ctx(ctx) {
             widget->installEventFilter(this);
-        }
-
-        void updateThickness() {
-            // Query thickness
-            bool native = false;
-            void *a[] = {
-                &native,
-                &m_thickness,
-            };
-            ctx->virtual_hook(AbstractWindowContext::BorderThicknessHook, &a);
-        }
-
-        void updateMargins() {
-            if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen)) {
-                widget->setContentsMargins({});
-            } else {
-                widget->setContentsMargins({0, int(m_thickness), 0, 0});
-            }
         }
 
     protected:
         bool eventFilter(QObject *obj, QEvent *event) override {
-            switch (event->type()) {
-                case QEvent::Paint: {
-                    if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen))
-                        break;
-
-                    auto paintEvent = static_cast<QPaintEvent *>(event);
-                    QPainter painter(widget);
-                    QRect rect = paintEvent->rect();
-                    QRegion region = paintEvent->region();
-                    void *args[] = {
-                        &painter,
-                        &rect,
-                        &region,
-                    };
-                    ctx->virtual_hook(AbstractWindowContext::DrawBordersHook, args);
-                    return true;
-                }
-
-                case QEvent::WindowStateChange: {
-                    updateMargins();
-                    break;
-                }
-
-                case QEvent::WindowActivate:
-                case QEvent::WindowDeactivate: {
-                    widget->update();
-                    break;
-                }
-
-                    // TODO: Handle DPI Change
-
-                default:
-                    break;
+            Q_UNUSED(obj)
+            if (event->type() == QEvent::WinIdChange) {
+                ctx->notifyWinIdChange();
             }
             return false;
         }
 
+    protected:
         QWidget *widget;
         AbstractWindowContext *ctx;
-        quint32 m_thickness;
     };
 
-    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
-    }
+    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() = default;
 
-    WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() {
-    }
+    WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() = default;
 
     void WidgetWindowAgentPrivate::init() {
     }
@@ -92,8 +41,7 @@
         : WidgetWindowAgent(*new WidgetWindowAgentPrivate(), parent) {
     }
 
-    WidgetWindowAgent::~WidgetWindowAgent() {
-    }
+    WidgetWindowAgent::~WidgetWindowAgent() = default;
 
     bool WidgetWindowAgent::setup(QWidget *w) {
         Q_ASSERT(w);
@@ -109,19 +57,14 @@
         w->setAttribute(Qt::WA_DontCreateNativeAncestors);
         w->setAttribute(Qt::WA_NativeWindow);
 
-        if (!d->setup(w, new WidgetItemDelegate())) {
-            return false;
-        }
+        d->setup(w, new WidgetItemDelegate());
         d->hostWidget = w;
 
-        // Install painting hook
-        if (bool needPaintBorder = false;
-            d->context->virtual_hook(AbstractWindowContext::NeedsDrawBordersHook, &needPaintBorder),
-            needPaintBorder) {
-            auto borderHandler = std::make_unique<WidgetBorderHandler>(w, d->context.get());
-            borderHandler->updateMargins();
-            d->borderHandler = std::move(borderHandler);
-        }
+#ifdef Q_OS_WINDOWS
+        d->setupWindows10BorderWorkaround();
+#endif
+        std::ignore = new WidgetWinIdChangeEventFilter(w, d->context.get());
+
         return true;
     }
 
@@ -159,11 +102,6 @@
     void WidgetWindowAgent::setHitTestVisible(const QWidget *w, bool visible) {
         Q_D(WidgetWindowAgent);
         d->context->setHitTestVisible(w, visible);
-    }
-
-    void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
-        Q_D(WidgetWindowAgent);
-        d->context->setHitTestVisible(rect, visible);
     }
 
     WidgetWindowAgent::WidgetWindowAgent(WidgetWindowAgentPrivate &d, QObject *parent)

--
Gitblit v1.9.1