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 |   77 ++------------------------------------
 1 files changed, 5 insertions(+), 72 deletions(-)

diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index e869010..b510efb 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -5,64 +5,13 @@
 #include <QtGui/QPainter>
 #include <QtCore/QDebug>
 
-#ifdef Q_OS_WINDOWS
-#  include <QWKCore/private/win10borderhandler_p.h>
-#endif
-
 #include "widgetitemdelegate_p.h"
 
 namespace QWK {
 
-#ifdef Q_OS_WINDOWS
-    class WidgetBorderHandler : public QObject, public Win10BorderHandler {
-    public:
-        explicit WidgetBorderHandler(QWidget *widget)
-            : Win10BorderHandler(widget->windowHandle()), widget(widget) {
-            widget->installEventFilter(this);
-        }
+    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() = default;
 
-        void updateGeometry() override {
-            if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen)) {
-                widget->setContentsMargins({});
-            } else {
-                widget->setContentsMargins({0, int(m_borderThickness), 0, 0});
-            }
-        }
-
-        void requestUpdate() override {
-            widget->update();
-        }
-
-        bool isActive() const override {
-            return widget->isActiveWindow();
-        }
-
-    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);
-                    paintBorder(painter, paintEvent->rect(), paintEvent->region());
-                    return true;
-                }
-                default:
-                    break;
-            }
-            return false;
-        }
-
-        QWidget *widget;
-    };
-#endif
-
-    WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
-    }
-
-    WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() {
-    }
+    WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() = default;
 
     void WidgetWindowAgentPrivate::init() {
     }
@@ -71,8 +20,7 @@
         : WidgetWindowAgent(*new WidgetWindowAgentPrivate(), parent) {
     }
 
-    WidgetWindowAgent::~WidgetWindowAgent() {
-    }
+    WidgetWindowAgent::~WidgetWindowAgent() = default;
 
     bool WidgetWindowAgent::setup(QWidget *w) {
         Q_ASSERT(w);
@@ -88,21 +36,11 @@
         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;
 
 #ifdef Q_OS_WINDOWS
-        // Install painting hook
-        if (bool needPaintBorder;
-            QMetaObject::invokeMethod(d->context.get(), "needWin10BorderHandler",
-                                      Qt::DirectConnection, Q_RETURN_ARG(bool, needPaintBorder)),
-            needPaintBorder) {
-            QMetaObject::invokeMethod(d->context.get(), "setWin10BorderHandler",
-                                      Qt::DirectConnection,
-                                      Q_ARG(Win10BorderHandler *, new WidgetBorderHandler(w)));
-        }
+        d->setupWindows10BorderWorkaround();
 #endif
         return true;
     }
@@ -141,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