From 59814f0ef77528995e2655247aecf2dfdf2f67d9 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周一, 18 12月 2023 21:56:48 +0800 Subject: [PATCH] Update README --- src/quick/quickwindowagent.cpp | 118 +++++----------------------------------------------------- 1 files changed, 11 insertions(+), 107 deletions(-) diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp index 1b29b42..4e07a3d 100644 --- a/src/quick/quickwindowagent.cpp +++ b/src/quick/quickwindowagent.cpp @@ -1,100 +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 - public: - explicit BorderItem(AbstractWindowContext *ctx, QQuickItem *parent = nullptr); - ~BorderItem() override; + QuickWindowAgentPrivate::QuickWindowAgentPrivate() = default; - void updateHeight(); - - public: - void paint(QPainter *painter) override; - void itemChange(ItemChange change, const ItemChangeData &data) override; - - private: - AbstractWindowContext *context; - - void _q_windowActivityChanged(); - }; - - 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::BorderThicknessHook, &args); - setHeight(thickness); - } - - void BorderItem::paint(QPainter *painter) { - QRect rect(QPoint(0, 0), size().toSize()); - QRegion region(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, - &BorderItem::_q_windowActivityChanged); - } - Q_FALLTHROUGH(); - case ItemVisibleHasChanged: - case ItemDevicePixelRatioHasChanged: - updateHeight(); - break; - default: - break; - } - } - - void BorderItem::_q_windowActivityChanged() { - update(); - } - - QuickWindowAgentPrivate::QuickWindowAgentPrivate() { - } - - QuickWindowAgentPrivate::~QuickWindowAgentPrivate() { - } + QuickWindowAgentPrivate::~QuickWindowAgentPrivate() = default; void QuickWindowAgentPrivate::init() { } @@ -103,8 +19,7 @@ : QuickWindowAgent(*new QuickWindowAgentPrivate(), parent) { } - QuickWindowAgent::~QuickWindowAgent() { - } + QuickWindowAgent::~QuickWindowAgent() = default; bool QuickWindowAgent::setup(QQuickWindow *window) { Q_ASSERT(window); @@ -117,16 +32,12 @@ return false; } - if (!d->setup(window, new QuickItemDelegate())) { - return false; - } + d->setup(window, new QuickItemDelegate()); 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; } @@ -161,14 +72,9 @@ return d->context->isHitTestVisible(item); } - void QuickWindowAgent::setHitTestVisible_item(const QQuickItem *item, bool visible) { + void QuickWindowAgent::setHitTestVisible(const QQuickItem *item, bool visible) { Q_D(QuickWindowAgent); d->context->setHitTestVisible(item, visible); - } - - void QuickWindowAgent::setHitTestVisible_rect(const QRect &rect, bool visible) { - Q_D(QuickWindowAgent); - d->context->setHitTestVisible(rect, visible); } QuickWindowAgent::QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent) @@ -176,6 +82,4 @@ d.init(); } -} - -#include "quickwindowagent.moc" \ No newline at end of file +} \ No newline at end of file -- Gitblit v1.9.1