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/quick/quickwindowagent.cpp | 96 ++++------------------------------------------- 1 files changed, 9 insertions(+), 87 deletions(-) diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp index 180779b..2e69f76 100644 --- a/src/quick/quickwindowagent.cpp +++ b/src/quick/quickwindowagent.cpp @@ -1,89 +1,16 @@ #include "quickwindowagent.h" #include "quickwindowagent_p.h" -#include "quickitemdelegate_p.h" #include <QtQuick/QQuickWindow> -#include <QtQuick/QQuickPaintedItem> -#include <QtQuick/private/qquickitem_p.h> #include <QtQuick/private/qquickanchors_p.h> + +#include "quickitemdelegate_p.h" namespace QWK { - class BorderItem : public QQuickPaintedItem { - Q_OBJECT + QuickWindowAgentPrivate::QuickWindowAgentPrivate() = default; - public: - explicit BorderItem(AbstractWindowContext *ctx, QQuickItem *parent = nullptr); - ~BorderItem() override; - - void updateHeight(); - - void paint(QPainter *painter) override; - - void itemChange(ItemChange change, const ItemChangeData &data) override; - - private: - AbstractWindowContext *context; - }; - - BorderItem::BorderItem(AbstractWindowContext *ctx, QQuickItem *parent) : QQuickPaintedItem(parent), context(ctx) { - setAntialiasing(true); // ### FIXME: do we need to enable or disable this? - setMipmap(true); // ### FIXME: do we need to enable or disable this? - setFillColor({}); // Will improve the performance a little bit. - setOpaquePainting(true); // Will also improve the performance, we don't draw semi-transparent borders of course. - - auto parentPri = QQuickItemPrivate::get(parent); - auto anchors = QQuickItemPrivate::get(this)->anchors(); - anchors->setTop(parentPri->top()); - anchors->setLeft(parentPri->left()); - anchors->setRight(parentPri->right()); - - setZ(10); - } - - BorderItem::~BorderItem() = default; - - void BorderItem::updateHeight() { - bool native = false; - quint32 thickness = 0; - void *args[] = { &native, &thickness }; - context->virtual_hook(AbstractWindowContext::QueryBorderThicknessHook, &args); - setHeight(thickness); - } - - void BorderItem::paint(QPainter *painter) { - auto rect = QRect{ QPoint{ 0, 0}, size().toSize() }; - auto region = QRegion{ rect }; - void *args[] = { - painter, - &rect, - ®ion - }; - context->virtual_hook(AbstractWindowContext::DrawBordersHook, args); - } - - void BorderItem::itemChange(ItemChange change, const ItemChangeData &data) { - QQuickPaintedItem::itemChange(change, data); - switch (change) { - case ItemSceneChange: - if (data.window) { - connect(data.window, &QQuickWindow::activeChanged, this, [this](){ update(); }); - } - Q_FALLTHROUGH(); - case ItemVisibleHasChanged: - case ItemDevicePixelRatioHasChanged: - updateHeight(); - break; - default: - break; - } - } - - QuickWindowAgentPrivate::QuickWindowAgentPrivate() { - } - - QuickWindowAgentPrivate::~QuickWindowAgentPrivate() { - } + QuickWindowAgentPrivate::~QuickWindowAgentPrivate() = default; void QuickWindowAgentPrivate::init() { } @@ -92,8 +19,7 @@ : QuickWindowAgent(*new QuickWindowAgentPrivate(), parent) { } - QuickWindowAgent::~QuickWindowAgent() { - } + QuickWindowAgent::~QuickWindowAgent() = default; bool QuickWindowAgent::setup(QQuickWindow *window) { Q_ASSERT(window); @@ -111,11 +37,9 @@ } d->hostWindow = window; - if (bool needPaintBorder = false; - d->context->virtual_hook(AbstractWindowContext::NeedsDrawBordersHook, &needPaintBorder), - needPaintBorder) { - d->borderItem = std::make_unique<BorderItem>(d->context.get(), window->contentItem()); - } +#ifdef Q_OS_WINDOWS + d->setupWindows10BorderWorkaround(); +#endif return true; } @@ -165,6 +89,4 @@ d.init(); } -} - -#include "quickwindowagent.moc" \ No newline at end of file +} \ No newline at end of file -- Gitblit v1.9.1