From 0339e9e5e19fd4fe65113e1a819826109b7e4727 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: ćšć, 28 12æ 2023 23:13:33 +0800 Subject: [PATCH] minor tweaks --- src/quick/quickwindowagent.cpp | 55 +++++++++++++++++++++++++++++++------------------------ 1 files changed, 31 insertions(+), 24 deletions(-) diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp index 80c10e3..20b48b9 100644 --- a/src/quick/quickwindowagent.cpp +++ b/src/quick/quickwindowagent.cpp @@ -1,17 +1,24 @@ #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() { - } + /*! + \class QuickWindowAgent + \brief QuickWindowAgent is the window agent for QtQuick. - QuickWindowAgentPrivate::~QuickWindowAgentPrivate() { - } + It provides interfaces for QtQuick and processes some Qt events related to the QQuickItem + instance. The usage of all APIs is consistent with the \a Widgets module. + */ + + QuickWindowAgentPrivate::QuickWindowAgentPrivate() = default; + + QuickWindowAgentPrivate::~QuickWindowAgentPrivate() = default; void QuickWindowAgentPrivate::init() { } @@ -20,8 +27,7 @@ : QuickWindowAgent(*new QuickWindowAgentPrivate(), parent) { } - QuickWindowAgent::~QuickWindowAgent() { - } + QuickWindowAgent::~QuickWindowAgent() = default; bool QuickWindowAgent::setup(QQuickWindow *window) { Q_ASSERT(window); @@ -34,19 +40,21 @@ return false; } - if (!d->setup(window, new QuickItemDelegate())) { - return true; - } + d->setup(window, new QuickItemDelegate()); d->hostWindow = window; + +#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS) + d->setupWindows10BorderWorkaround(); +#endif return true; } - const QQuickItem *QuickWindowAgent::titleBar() const { + QQuickItem *QuickWindowAgent::titleBar() const { Q_D(const QuickWindowAgent); - return static_cast<const QQuickItem *>(d->context->titleBar()); + return static_cast<QQuickItem *>(d->context->titleBar()); } - void QuickWindowAgent::setTitleBar(const QQuickItem *item) { + void QuickWindowAgent::setTitleBar(QQuickItem *item) { Q_D(QuickWindowAgent); if (!d->context->setTitleBar(item)) { return; @@ -54,12 +62,12 @@ Q_EMIT titleBarWidgetChanged(item); } - const QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const { + QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const { Q_D(const QuickWindowAgent); - return static_cast<const QQuickItem *>(d->context->systemButton(button)); + return static_cast<QQuickItem *>(d->context->systemButton(button)); } - void QuickWindowAgent::setSystemButton(SystemButton button, const QQuickItem *item) { + void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) { Q_D(QuickWindowAgent); if (!d->context->setSystemButton(button, item)) { return; @@ -77,13 +85,12 @@ d->context->setHitTestVisible(item, visible); } - void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) { - Q_D(QuickWindowAgent); - d->context->setHitTestVisible(rect, visible); - } - + /*! + \internal + */ QuickWindowAgent::QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent) - : CoreWindowAgent(d, parent) { + : WindowAgentBase(d, parent) { d.init(); } -} + +} \ No newline at end of file -- Gitblit v1.9.1