From acece00ae291d143c3b712a98814a64b9dd43f14 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周一, 11 12月 2023 17:12:41 +0800 Subject: [PATCH] Remove VersionHelper --- src/widgets/widgetwindowagent.cpp | 104 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 74 insertions(+), 30 deletions(-) diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp index 252213e..bde4f98 100644 --- a/src/widgets/widgetwindowagent.cpp +++ b/src/widgets/widgetwindowagent.cpp @@ -1,9 +1,44 @@ #include "widgetwindowagent.h" #include "widgetwindowagent_p.h" +#include <QtGui/QtEvents> +#include <QtGui/QPainter> + #include "widgetitemdelegate_p.h" namespace QWK { + + class WidgetPaintFilter : public QObject { + public: + WidgetPaintFilter(QWidget *widget, AbstractWindowContext *ctx) : widget(widget), ctx(ctx) { + widget->installEventFilter(this); + } + + protected: + bool eventFilter(QObject *obj, QEvent *event) override { + switch (event->type()) { + case QEvent::Paint: { + auto e = static_cast<QPaintEvent *>(event); + QPainter painter(widget); + QRect rect = e->rect(); + QRegion region = e->region(); + void *a[] = { + &painter, + &rect, + ®ion, + }; + ctx->virtual_hook(AbstractWindowContext::DrawBordersHook, a); + return true; + } + default: + break; + } + return false; + } + + QWidget *widget; + AbstractWindowContext *ctx; + }; WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() { } @@ -32,40 +67,21 @@ return false; } - std::ignore = w->winId(); // Make sure the window handle is created - if (!d->setup(w->windowHandle(), new WidgetItemDelegate())) { + w->setAttribute(Qt::WA_DontCreateNativeAncestors); + w->setAttribute(Qt::WA_NativeWindow); + + if (!d->setup(w, new WidgetItemDelegate())) { return false; } d->hostWidget = w; - return true; - } - bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const { - Q_D(const WidgetWindowAgent); - return d->context->isHitTestVisible(w); - } - - void WidgetWindowAgent::setHitTestVisible(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); - } - - QWidget *WidgetWindowAgent::systemButton(CoreWindowAgent::SystemButton button) const { - Q_D(const WidgetWindowAgent); - return static_cast<QWidget *>(d->context->systemButton(button)); - } - - void WidgetWindowAgent::setSystemButton(CoreWindowAgent::SystemButton button, QWidget *w) { - Q_D(WidgetWindowAgent); - if (!d->context->setSystemButton(button, w)) { - return; + // Install painting hook + if (bool needPaintBorder = false; + d->context->virtual_hook(AbstractWindowContext::NeedsDrawBordersHook, &needPaintBorder), + needPaintBorder) { + d->paintFilter = std::make_unique<WidgetPaintFilter>(w, d->context.get()); } - Q_EMIT systemButtonChanged(button, w); + return true; } QWidget *WidgetWindowAgent::titleBar() const { @@ -81,8 +97,36 @@ 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