From e9f790d3533ebaee1f782e91b6e13b2c6375c86a Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周二, 11 2月 2025 23:06:01 +0800
Subject: [PATCH] AWC: fix window attribute handler
---
src/quick/quickwindowagent.cpp | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 2bc9bca..5225a09 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -1,16 +1,28 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#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 +31,7 @@
: QuickWindowAgent(*new QuickWindowAgentPrivate(), parent) {
}
- QuickWindowAgent::~QuickWindowAgent() {
- }
+ QuickWindowAgent::~QuickWindowAgent() = default;
bool QuickWindowAgent::setup(QQuickWindow *window) {
Q_ASSERT(window);
@@ -33,10 +44,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 +63,9 @@
if (!d->context->setTitleBar(item)) {
return;
}
+#ifdef Q_OS_MAC
+ setSystemButtonArea(nullptr);
+#endif
Q_EMIT titleBarWidgetChanged(item);
}
@@ -66,21 +82,23 @@
Q_EMIT systemButtonChanged(button, item);
}
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+ bool QuickWindowAgent::isHitTestVisible(QQuickItem *item) const {
+#else
bool QuickWindowAgent::isHitTestVisible(const QQuickItem *item) const {
+#endif
Q_D(const QuickWindowAgent);
return d->context->isHitTestVisible(item);
}
- void QuickWindowAgent::setHitTestVisible_item(const QQuickItem *item, bool visible) {
+ void QuickWindowAgent::setHitTestVisible(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