From 9dcea027f16c4ce5852da3dfc8aca284c582bd7d Mon Sep 17 00:00:00 2001
From: sola.lu <sola.lu.greentest.com.cn>
Date: 周五, 06 6月 2025 18:19:18 +0800
Subject: [PATCH] 1.注释掉custom margin，解决程序放大后，遮盖窗口底部内容的问题。
---
src/quick/quickwindowagent.cpp | 66 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 80c10e3..5225a09 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -1,17 +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() {
}
@@ -20,8 +31,7 @@
: QuickWindowAgent(*new QuickWindowAgentPrivate(), parent) {
}
- QuickWindowAgent::~QuickWindowAgent() {
- }
+ QuickWindowAgent::~QuickWindowAgent() = default;
bool QuickWindowAgent::setup(QQuickWindow *window) {
Q_ASSERT(window);
@@ -34,32 +44,37 @@
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;
}
+#ifdef Q_OS_MAC
+ setSystemButtonArea(nullptr);
+#endif
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;
@@ -67,23 +82,26 @@
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(const QQuickItem *item, bool visible) {
+ void QuickWindowAgent::setHitTestVisible(QQuickItem *item, bool visible) {
Q_D(QuickWindowAgent);
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();
}
+
}
--
Gitblit v1.9.1