From dddf96c011723a12b11acc2980c10eb370961021 Mon Sep 17 00:00:00 2001 From: Zhao Yuhang <2546789017@qq.com> Date: 周五, 15 12月 2023 21:35:17 +0800 Subject: [PATCH] add qt impl --- src/widgets/widgetwindowagent.cpp | 72 ++++------------------------------- 1 files changed, 9 insertions(+), 63 deletions(-) diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp index 578ab83..8fa28a7 100644 --- a/src/widgets/widgetwindowagent.cpp +++ b/src/widgets/widgetwindowagent.cpp @@ -9,60 +9,9 @@ namespace QWK { - class WidgetBorderHandler : public QObject { - public: - WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx) - : widget(widget), ctx(ctx) { - widget->installEventFilter(this); - } + WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() = default; - 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() { - } - - WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() { - } + WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() = default; void WidgetWindowAgentPrivate::init() { } @@ -71,8 +20,7 @@ : WidgetWindowAgent(*new WidgetWindowAgentPrivate(), parent) { } - WidgetWindowAgent::~WidgetWindowAgent() { - } + WidgetWindowAgent::~WidgetWindowAgent() = default; bool WidgetWindowAgent::setup(QWidget *w) { Q_ASSERT(w); @@ -93,14 +41,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; } @@ -114,6 +57,9 @@ if (!d->context->setTitleBar(w)) { return; } +#ifdef Q_OS_MACOS + d->setupMacOSTitleBar(w); +#endif Q_EMIT titleBarWidgetChanged(w); } -- Gitblit v1.9.1