From 58ef035603b8e3bf9299b4bddcdebcc653ea8810 Mon Sep 17 00:00:00 2001 From: SineStriker <trueful@163.com> Date: 周五, 29 12月 2023 11:50:33 +0800 Subject: [PATCH] Window bar support I18N --- src/quick/quickwindowagent.cpp | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp index 9422f65..3cecb21 100644 --- a/src/quick/quickwindowagent.cpp +++ b/src/quick/quickwindowagent.cpp @@ -8,11 +8,17 @@ 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() { } @@ -21,8 +27,7 @@ : QuickWindowAgent(*new QuickWindowAgentPrivate(), parent) { } - QuickWindowAgent::~QuickWindowAgent() { - } + QuickWindowAgent::~QuickWindowAgent() = default; bool QuickWindowAgent::setup(QQuickWindow *window) { Q_ASSERT(window); @@ -35,12 +40,10 @@ return false; } - if (!d->setup(window, new QuickItemDelegate())) { - return false; - } + d->setup(window, new QuickItemDelegate()); d->hostWindow = window; -#ifdef Q_OS_WINDOWS +#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS) d->setupWindows10BorderWorkaround(); #endif return true; @@ -56,6 +59,9 @@ if (!d->context->setTitleBar(item)) { return; } +#ifdef Q_OS_MAC + setSystemButtonArea(nullptr); +#endif Q_EMIT titleBarWidgetChanged(item); } @@ -77,16 +83,14 @@ 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); - } - + /*! + \internal + */ QuickWindowAgent::QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent) : WindowAgentBase(d, parent) { d.init(); -- Gitblit v1.9.1