From 677e7a737897e8c2a60564085821545810369e02 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周一, 11 12月 2023 22:43:14 +0800 Subject: [PATCH] Widgets: Add window state handler --- src/widgets/widgetwindowagent.cpp | 72 ++++++++++++++++++++++++++++++++++-- 1 files changed, 68 insertions(+), 4 deletions(-) diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp index 6dd9015..578ab83 100644 --- a/src/widgets/widgetwindowagent.cpp +++ b/src/widgets/widgetwindowagent.cpp @@ -1,9 +1,62 @@ #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) { + 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, + ®ion, + }; + ctx->virtual_hook(AbstractWindowContext::DrawBordersHook, args); + return true; + } + + case QEvent::WindowStateChange: { + updateMargins(); + break; + } + default: + break; + } + return false; + } + + QWidget *widget; + AbstractWindowContext *ctx; + }; WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() { } @@ -32,11 +85,22 @@ return false; } - std::ignore = w->winId(); // Make sure the window handle is created + w->setAttribute(Qt::WA_DontCreateNativeAncestors); + w->setAttribute(Qt::WA_NativeWindow); + if (!d->setup(w, new WidgetItemDelegate())) { return false; } 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; } @@ -66,12 +130,12 @@ Q_EMIT systemButtonChanged(button, w); } - bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const { + bool WidgetWindowAgent::isHitTestVisible(const QWidget *w) const { Q_D(const WidgetWindowAgent); return d->context->isHitTestVisible(w); } - void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) { + void WidgetWindowAgent::setHitTestVisible(const QWidget *w, bool visible) { Q_D(WidgetWindowAgent); d->context->setHitTestVisible(w, visible); } @@ -82,7 +146,7 @@ } WidgetWindowAgent::WidgetWindowAgent(WidgetWindowAgentPrivate &d, QObject *parent) - : CoreWindowAgent(d, parent) { + : WindowAgentBase(d, parent) { d.init(); } } -- Gitblit v1.9.1