From 327055934009dc416be6234db8e4d26fab81fb80 Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周四, 21 12月 2023 23:21:28 +0800
Subject: [PATCH] Merge pull request #8 from stdware/stylesupport

---
 src/widgets/widgetwindowagent.cpp |   60 ++++++++----------------------------------------------------
 1 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index bde4f98..b510efb 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -3,48 +3,15 @@
 
 #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);
-        }
+    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() = default;
 
-    protected:
-        bool eventFilter(QObject *obj, QEvent *event) override {
-            switch (event->type()) {
-                case QEvent::Paint: {
-                    auto e = static_cast<QPaintEvent *>(event);
-                    QPainter painter(widget);
-                    QRect rect = e->rect();
-                    QRegion region = e->region();
-                    void *a[] = {
-                        &painter,
-                        &rect,
-                        &region,
-                    };
-                    ctx->virtual_hook(AbstractWindowContext::DrawBordersHook, a);
-                    return true;
-                }
-                default:
-                    break;
-            }
-            return false;
-        }
-
-        QWidget *widget;
-        AbstractWindowContext *ctx;
-    };
-
-    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
-    }
-
-    WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() {
-    }
+    WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() = default;
 
     void WidgetWindowAgentPrivate::init() {
     }
@@ -53,8 +20,7 @@
         : WidgetWindowAgent(*new WidgetWindowAgentPrivate(), parent) {
     }
 
-    WidgetWindowAgent::~WidgetWindowAgent() {
-    }
+    WidgetWindowAgent::~WidgetWindowAgent() = default;
 
     bool WidgetWindowAgent::setup(QWidget *w) {
         Q_ASSERT(w);
@@ -70,17 +36,12 @@
         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) {
-            d->paintFilter = std::make_unique<WidgetPaintFilter>(w, d->context.get());
-        }
+#ifdef Q_OS_WINDOWS
+        d->setupWindows10BorderWorkaround();
+#endif
         return true;
     }
 
@@ -118,11 +79,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