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 | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/quick/quickwindowagent.h b/src/quick/quickwindowagent.h
index 0d60a7a..e4290e6 100644
--- a/src/quick/quickwindowagent.h
+++ b/src/quick/quickwindowagent.h
@@ -1,3 +1,7 @@
+// 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
@@ -27,23 +31,30 @@
Q_INVOKABLE QQuickItem *systemButton(SystemButton button) const;
Q_INVOKABLE void setSystemButton(SystemButton button, QQuickItem *item);
+#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;
- Q_INVOKABLE inline void setHitTestVisible(const QQuickItem *item, bool visible = true);
- Q_INVOKABLE void setHitTestVisible_item(const QQuickItem *item, bool visible = true);
- Q_INVOKABLE void setHitTestVisible_rect(const QRect &rect, bool visible = true);
+#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);
};
- inline void QuickWindowAgent::setHitTestVisible(const QQuickItem *item, bool visible) {
- setHitTestVisible_item(item, visible);
- }
-
}
-#endif // QUICKWINDOWAGENT_H
\ No newline at end of file
+#endif // QUICKWINDOWAGENT_H
--
Gitblit v1.9.1