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.h | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/quick/quickwindowagent.h b/src/quick/quickwindowagent.h
index 53e8652..e4290e6 100644
--- a/src/quick/quickwindowagent.h
+++ b/src/quick/quickwindowagent.h
@@ -1,17 +1,21 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#ifndef QUICKWINDOWAGENT_H
#define QUICKWINDOWAGENT_H
#include <QtQuick/QQuickItem>
#include <QtQuick/QQuickWindow>
-#include <QWKCore/corewindowagent.h>
+#include <QWKCore/windowagentbase.h>
#include <QWKQuick/qwkquickglobal.h>
namespace QWK {
class QuickWindowAgentPrivate;
- class QWK_QUICK_EXPORT QuickWindowAgent : public CoreWindowAgent {
+ class QWK_QUICK_EXPORT QuickWindowAgent : public WindowAgentBase {
Q_OBJECT
Q_DECLARE_PRIVATE(QuickWindowAgent)
public:
@@ -19,21 +23,33 @@
~QuickWindowAgent() override;
public:
- bool setup(QQuickWindow *window);
+ Q_INVOKABLE bool setup(QQuickWindow *window);
- const QQuickItem *titleBar() const;
- void setTitleBar(const QQuickItem *item);
+ Q_INVOKABLE QQuickItem *titleBar() const;
+ Q_INVOKABLE void setTitleBar(QQuickItem *item);
- const QQuickItem *systemButton(SystemButton button) const;
- void setSystemButton(SystemButton button, const QQuickItem *item);
+ Q_INVOKABLE QQuickItem *systemButton(SystemButton button) const;
+ Q_INVOKABLE void setSystemButton(SystemButton button, QQuickItem *item);
- bool isHitTestVisible(const QQuickItem *item) const;
- void setHitTestVisible(const QQuickItem *item, bool visible = true);
- void setHitTestVisible(const QRect &rect, bool visible = true);
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+ Q_INVOKABLE bool isHitTestVisible(QQuickItem *item) const;
+#else
+ Q_INVOKABLE bool isHitTestVisible(const QQuickItem *item) const;
+#endif
+ Q_INVOKABLE void setHitTestVisible(QQuickItem *item, bool visible = true);
+
+#ifdef Q_OS_MAC
+ // The system button area APIs are experimental, very likely to change in the future.
+ Q_INVOKABLE QQuickItem *systemButtonArea() const;
+ Q_INVOKABLE void setSystemButtonArea(QQuickItem *item);
+
+ Q_INVOKABLE ScreenRectCallback systemButtonAreaCallback() const;
+ Q_INVOKABLE void setSystemButtonAreaCallback(const ScreenRectCallback &callback);
+#endif
Q_SIGNALS:
- void titleBarWidgetChanged(const QQuickItem *item);
- void systemButtonChanged(SystemButton button, const QQuickItem *item);
+ void titleBarWidgetChanged(QQuickItem *item);
+ void systemButtonChanged(SystemButton button, QQuickItem *item);
protected:
QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent = nullptr);
@@ -41,4 +57,4 @@
}
-#endif // QUICKWINDOWAGENT_H
\ No newline at end of file
+#endif // QUICKWINDOWAGENT_H
--
Gitblit v1.9.1