From 59207cbc449e2e69e6b794115f8aeae168dba405 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周三, 13 12月 2023 20:08:19 +0800
Subject: [PATCH] minor tweaks

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

diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index 578ab83..ff76aef 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -9,55 +9,6 @@
 
 namespace QWK {
 
-    class WidgetBorderHandler : public QObject {
-    public:
-        WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx)
-            : widget(widget), ctx(ctx) {
-            widget->installEventFilter(this);
-        }
-
-        void updateMargins() {
-            if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen)) {
-                widget->setContentsMargins({});
-            } else {
-                widget->setContentsMargins({0, 1, 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;
-                }
-                default:
-                    break;
-            }
-            return false;
-        }
-
-        QWidget *widget;
-        AbstractWindowContext *ctx;
-    };
-
     WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
     }
 
@@ -93,14 +44,9 @@
         }
         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
         return true;
     }
 

--
Gitblit v1.9.1