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 | 86 ++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 45 deletions(-) diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp index 1b653bb..4e07a3d 100644 --- a/src/quick/quickwindowagent.cpp +++ b/src/quick/quickwindowagent.cpp @@ -1,17 +1,16 @@ #include "quickwindowagent.h" #include "quickwindowagent_p.h" -#include "quickitemdelegate_p.h" - #include <QtQuick/QQuickWindow> +#include <QtQuick/private/qquickanchors_p.h> + +#include "quickitemdelegate_p.h" namespace QWK { - QuickWindowAgentPrivate::QuickWindowAgentPrivate() { - } + QuickWindowAgentPrivate::QuickWindowAgentPrivate() = default; - QuickWindowAgentPrivate::~QuickWindowAgentPrivate() { - } + QuickWindowAgentPrivate::~QuickWindowAgentPrivate() = default; void QuickWindowAgentPrivate::init() { } @@ -20,8 +19,7 @@ : QuickWindowAgent(*new QuickWindowAgentPrivate(), parent) { } - QuickWindowAgent::~QuickWindowAgent() { - } + QuickWindowAgent::~QuickWindowAgent() = default; bool QuickWindowAgent::setup(QQuickWindow *window) { Q_ASSERT(window); @@ -30,60 +28,58 @@ } Q_D(QuickWindowAgent); - if (d->host) { + if (d->hostWindow) { return false; } - if (!d->setup(window, std::make_shared<QuickItemDelegate>())) { - return true; - } - d->host = window; + d->setup(window, new QuickItemDelegate()); + d->hostWindow = window; + +#ifdef Q_OS_WINDOWS + d->setupWindows10BorderWorkaround(); +#endif return true; - } - - bool QuickWindowAgent::isHitTestVisible(QQuickItem *item) const { - Q_D(const QuickWindowAgent); - return d->eventHandler->isHitTestVisible(item); - } - - void QuickWindowAgent::setHitTestVisible(QQuickItem *item, bool visible) { - Q_D(QuickWindowAgent); - d->eventHandler->setHitTestVisible(item, visible); - } - - void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) { - Q_D(QuickWindowAgent); - d->eventHandler->setHitTestVisible(rect, visible); - } - - QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const { - Q_D(const QuickWindowAgent); - return qobject_cast<QQuickItem *>(d->eventHandler->systemButton(button)); - } - - void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) { - Q_D(QuickWindowAgent); - if (!d->eventHandler->setSystemButton(button, item)) { - return; - } - Q_EMIT systemButtonChanged(button, item); } QQuickItem *QuickWindowAgent::titleBar() const { Q_D(const QuickWindowAgent); - return qobject_cast<QQuickItem *>(d->eventHandler->titleBar()); + return static_cast<QQuickItem *>(d->context->titleBar()); } void QuickWindowAgent::setTitleBar(QQuickItem *item) { Q_D(QuickWindowAgent); - if (!d->eventHandler->setTitleBar(item)) { + if (!d->context->setTitleBar(item)) { return; } Q_EMIT titleBarWidgetChanged(item); } + QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const { + Q_D(const QuickWindowAgent); + return static_cast<QQuickItem *>(d->context->systemButton(button)); + } + + void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) { + Q_D(QuickWindowAgent); + if (!d->context->setSystemButton(button, item)) { + return; + } + Q_EMIT systemButtonChanged(button, item); + } + + bool QuickWindowAgent::isHitTestVisible(const QQuickItem *item) const { + Q_D(const QuickWindowAgent); + return d->context->isHitTestVisible(item); + } + + void QuickWindowAgent::setHitTestVisible(const QQuickItem *item, bool visible) { + Q_D(QuickWindowAgent); + d->context->setHitTestVisible(item, visible); + } + QuickWindowAgent::QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent) - : CoreWindowAgent(d, parent) { + : WindowAgentBase(d, parent) { d.init(); } -} + +} \ No newline at end of file -- Gitblit v1.9.1