From 5dbf2d71aa0aa6b8f0cb8f1334d061e0d759caf8 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 11 12月 2023 22:18:38 +0800
Subject: [PATCH] Add workaround handling misplace

---
 src/widgets/widgetwindowagent.cpp |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index 6dd9015..e859fbd 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -1,9 +1,44 @@
 #include "widgetwindowagent.h"
 #include "widgetwindowagent_p.h"
 
+#include <QtGui/QtEvents>
+#include <QtGui/QPainter>
+
 #include "widgetitemdelegate_p.h"
 
 namespace QWK {
+
+    class WidgetPaintFilter : public QObject {
+    public:
+        WidgetPaintFilter(QWidget *widget, AbstractWindowContext *ctx) : widget(widget), ctx(ctx) {
+            widget->installEventFilter(this);
+        }
+
+    protected:
+        bool eventFilter(QObject *obj, QEvent *event) override {
+            switch (event->type()) {
+                case QEvent::Paint: {
+                    auto pe = static_cast<QPaintEvent *>(event);
+                    QPainter painter(widget);
+                    QRect rect = pe->rect();
+                    QRegion region = pe->region();
+                    void *args[] = {
+                        &painter,
+                        &rect,
+                        &region,
+                    };
+                    ctx->virtual_hook(AbstractWindowContext::DrawBordersHook, args);
+                    return true;
+                }
+                default:
+                    break;
+            }
+            return false;
+        }
+
+        QWidget *widget;
+        AbstractWindowContext *ctx;
+    };
 
     WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
     }
@@ -32,11 +67,25 @@
             return false;
         }
 
-        std::ignore = w->winId(); // Make sure the window handle is created
+        w->setAttribute(Qt::WA_DontCreateNativeAncestors);
+        w->setAttribute(Qt::WA_NativeWindow);
+
         if (!d->setup(w, new WidgetItemDelegate())) {
             return false;
         }
         d->hostWidget = w;
+
+        // Install painting hook
+        if (bool needPaintBorder = false;
+            d->context->virtual_hook(AbstractWindowContext::NeedsDrawBordersHook, &needPaintBorder),
+            needPaintBorder) {
+            d->paintFilter = std::make_unique<WidgetPaintFilter>(w, d->context.get());
+        }
+
+        if (d->context->key() == "win32") {
+            w->setContentsMargins(0, 1, 0, 0);
+        }
+
         return true;
     }
 
@@ -66,12 +115,12 @@
         Q_EMIT systemButtonChanged(button, w);
     }
 
-    bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const {
+    bool WidgetWindowAgent::isHitTestVisible(const QWidget *w) const {
         Q_D(const WidgetWindowAgent);
         return d->context->isHitTestVisible(w);
     }
 
-    void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
+    void WidgetWindowAgent::setHitTestVisible(const QWidget *w, bool visible) {
         Q_D(WidgetWindowAgent);
         d->context->setHitTestVisible(w, visible);
     }
@@ -82,7 +131,7 @@
     }
 
     WidgetWindowAgent::WidgetWindowAgent(WidgetWindowAgentPrivate &d, QObject *parent)
-        : CoreWindowAgent(d, parent) {
+        : WindowAgentBase(d, parent) {
         d.init();
     }
 }

--
Gitblit v1.9.1