From 76924a335f40a0c3cc13805b4cb9429c336d33ca Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周五, 29 12月 2023 11:34:22 +0800
Subject: [PATCH] Optimize system button area APIs
---
src/quick/quickwindowagent.cpp | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 2bc9bca..3cecb21 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -1,16 +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() {
}
@@ -19,8 +27,7 @@
: QuickWindowAgent(*new QuickWindowAgentPrivate(), parent) {
}
- QuickWindowAgent::~QuickWindowAgent() {
- }
+ QuickWindowAgent::~QuickWindowAgent() = default;
bool QuickWindowAgent::setup(QQuickWindow *window) {
Q_ASSERT(window);
@@ -33,10 +40,12 @@
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;
}
@@ -50,6 +59,9 @@
if (!d->context->setTitleBar(item)) {
return;
}
+#ifdef Q_OS_MAC
+ setSystemButtonArea(nullptr);
+#endif
Q_EMIT titleBarWidgetChanged(item);
}
@@ -71,19 +83,17 @@
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();
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1