From 52babc9fdc9466ee65b2fbea5811c4439c37b135 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 12 12月 2023 12:59:51 +0800
Subject: [PATCH] minor tweaks

---
 src/widgets/widgetwindowagent.cpp |  160 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 124 insertions(+), 36 deletions(-)

diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index d3200a7..ea8f6df 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -1,9 +1,83 @@
 #include "widgetwindowagent.h"
 #include "widgetwindowagent_p.h"
 
+#include <QtGui/QtEvents>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>
+
 #include "widgetitemdelegate_p.h"
 
 namespace QWK {
+
+    class WidgetBorderHandler : public QObject {
+    public:
+        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: {
+                    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;
+                }
+
+                case QEvent::WindowActivate:
+                case QEvent::WindowDeactivate: {
+                    widget->update();
+                    break;
+                }
+
+                    // TODO: Handle DPI Change
+
+                default:
+                    break;
+            }
+            return false;
+        }
+
+        QWidget *widget;
+        AbstractWindowContext *ctx;
+        quint32 m_thickness;
+    };
 
     WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
     }
@@ -21,65 +95,79 @@
     WidgetWindowAgent::~WidgetWindowAgent() {
     }
 
-    void WidgetWindowAgent::setup(QWidget *w) {
+    bool WidgetWindowAgent::setup(QWidget *w) {
         Q_ASSERT(w);
         if (!w) {
-            return;
+            return false;
         }
 
         Q_D(WidgetWindowAgent);
-        if (d->host) {
-            return;
+        if (d->hostWidget) {
+            return false;
         }
-        d->host = w;
 
-        std::ignore = w->winId(); // Make sure the window handle is created
-        d->setup(w->windowHandle(), new WidgetItemDelegate());
-    }
+        w->setAttribute(Qt::WA_DontCreateNativeAncestors);
+        w->setAttribute(Qt::WA_NativeWindow);
 
-    bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const {
-        Q_D(const WidgetWindowAgent);
-        return d->m_eventHandler->isHitTestVisible(w);
-    }
-
-    void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
-        Q_D(WidgetWindowAgent);
-        d->m_eventHandler->setHitTestVisible(w, visible);
-    }
-
-    void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
-        Q_D(WidgetWindowAgent);
-        d->m_eventHandler->setHitTestVisible(rect, visible);
-    }
-
-    QWidget *WidgetWindowAgent::systemButton(CoreWindowAgent::SystemButton button) const {
-        Q_D(const WidgetWindowAgent);
-        return static_cast<QWidget *>(d->m_eventHandler->systemButton(button));
-    }
-
-    void WidgetWindowAgent::setSystemButton(CoreWindowAgent::SystemButton button, QWidget *w) {
-        Q_D(WidgetWindowAgent);
-        if (!d->m_eventHandler->setSystemButton(button, w)) {
-            return;
+        if (!d->setup(w, new WidgetItemDelegate())) {
+            return false;
         }
-        Q_EMIT systemButtonChanged(button, w);
+        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);
+        }
+        return true;
     }
 
     QWidget *WidgetWindowAgent::titleBar() const {
         Q_D(const WidgetWindowAgent);
-        return static_cast<QWidget *>(d->m_eventHandler->titleBar());
+        return static_cast<QWidget *>(d->context->titleBar());
     }
 
     void WidgetWindowAgent::setTitleBar(QWidget *w) {
         Q_D(WidgetWindowAgent);
-        if (!d->m_eventHandler->setTitleBar(w)) {
+        if (!d->context->setTitleBar(w)) {
             return;
         }
         Q_EMIT titleBarWidgetChanged(w);
     }
 
+    QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
+        Q_D(const WidgetWindowAgent);
+        return static_cast<QWidget *>(d->context->systemButton(button));
+    }
+
+    void WidgetWindowAgent::setSystemButton(SystemButton button, QWidget *w) {
+        Q_D(WidgetWindowAgent);
+        if (!d->context->setSystemButton(button, w)) {
+            return;
+        }
+        Q_EMIT systemButtonChanged(button, w);
+    }
+
+    bool WidgetWindowAgent::isHitTestVisible(const QWidget *w) const {
+        Q_D(const WidgetWindowAgent);
+        return d->context->isHitTestVisible(w);
+    }
+
+    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)
-        : CoreWindowAgent(d, parent) {
+        : WindowAgentBase(d, parent) {
         d.init();
     }
 }

--
Gitblit v1.9.1