From 5078f898257a53295167f22c67005ad1b30d4bf8 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 12 12月 2023 02:53:57 +0800
Subject: [PATCH] Tested MinGW 13.2.0

---
 src/widgets/widgetwindowagent.cpp |   62 ++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index 43528b5..ea8f6df 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -3,33 +3,71 @@
 
 #include <QtGui/QtEvents>
 #include <QtGui/QPainter>
+#include <QtCore/QDebug>
 
 #include "widgetitemdelegate_p.h"
 
 namespace QWK {
 
-    class WidgetPaintFilter : public QObject {
+    class WidgetBorderHandler : public QObject {
     public:
-        WidgetPaintFilter(QWidget *widget, AbstractWindowContext *ctx) : widget(widget), ctx(ctx) {
+        WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx)
+            : widget(widget), ctx(ctx), m_thickness(0) {
+            updateThickness();
             widget->installEventFilter(this);
+        }
+
+        void updateThickness() {
+            // Query thickness
+            bool native = false;
+            void *a[] = {
+                &native,
+                &m_thickness,
+            };
+            ctx->virtual_hook(AbstractWindowContext::BorderThicknessHook, &a);
+        }
+
+        void updateMargins() {
+            if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen)) {
+                widget->setContentsMargins({});
+            } else {
+                widget->setContentsMargins({0, int(m_thickness), 0, 0});
+            }
         }
 
     protected:
         bool eventFilter(QObject *obj, QEvent *event) override {
             switch (event->type()) {
                 case QEvent::Paint: {
-                    auto e = static_cast<QPaintEvent *>(event);
+                    if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen))
+                        break;
+
+                    auto paintEvent = static_cast<QPaintEvent *>(event);
                     QPainter painter(widget);
-                    QRect rect = e->rect();
-                    QRegion region = e->region();
-                    void *a[] = {
+                    QRect rect = paintEvent->rect();
+                    QRegion region = paintEvent->region();
+                    void *args[] = {
                         &painter,
                         &rect,
                         &region,
                     };
-                    ctx->virtual_hook(AbstractWindowContext::DrawBordersHook, a);
+                    ctx->virtual_hook(AbstractWindowContext::DrawBordersHook, args);
                     return true;
                 }
+
+                case QEvent::WindowStateChange: {
+                    updateMargins();
+                    break;
+                }
+
+                case QEvent::WindowActivate:
+                case QEvent::WindowDeactivate: {
+                    widget->update();
+                    break;
+                }
+
+                    // TODO: Handle DPI Change
+
                 default:
                     break;
             }
@@ -38,6 +76,7 @@
 
         QWidget *widget;
         AbstractWindowContext *ctx;
+        quint32 m_thickness;
     };
 
     WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
@@ -79,13 +118,10 @@
         if (bool needPaintBorder = false;
             d->context->virtual_hook(AbstractWindowContext::NeedsDrawBordersHook, &needPaintBorder),
             needPaintBorder) {
-            d->paintFilter = std::make_unique<WidgetPaintFilter>(w, d->context.get());
+            auto borderHandler = std::make_unique<WidgetBorderHandler>(w, d->context.get());
+            borderHandler->updateMargins();
+            d->borderHandler = std::move(borderHandler);
         }
-
-        if (d->context->key() == "win32") {
-            w->setContentsMargins(0, 1, 0, 0);
-        }
-
         return true;
     }
 

--
Gitblit v1.9.1