From a51b5688e1c33d3ce96b48c869603b00f908f513 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 13 12月 2023 04:16:37 +0800
Subject: [PATCH] Make better code structure for border handlers

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

diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index e859fbd..ff76aef 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -3,42 +3,11 @@
 
 #include <QtGui/QtEvents>
 #include <QtGui/QPainter>
+#include <QtCore/QDebug>
 
 #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() {
     }
@@ -75,17 +44,9 @@
         }
         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);
-        }
-
+#ifdef Q_OS_WINDOWS
+        d->setupWindows10BorderWorkaround();
+#endif
         return true;
     }
 

--
Gitblit v1.9.1