From f79b4c3ef8fae15e1bce56e4443caa76a9e2b00a Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: ćšć, 10 4æ 2025 11:26:28 +0800
Subject: [PATCH] update qmsetup
---
src/core/contexts/abstractwindowcontext_p.h | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index e978cb4..dc18f37 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -116,13 +116,13 @@
QPointer<QWindow> m_windowHandle;
WId m_windowId{};
- QSet<const QObject *> m_hitTestVisibleItems;
+ QVector<QPointer<QObject>> m_hitTestVisibleItems;
#ifdef Q_OS_MAC
ScreenRectCallback m_systemButtonAreaCallback;
#endif
- QObject *m_titleBar{};
- std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{};
+ QPointer<QObject> m_titleBar{};
+ std::array<QPointer<QObject>, WindowAgentBase::Close + 1> m_systemButtons{};
std::list<std::pair<QString, QVariant>> m_windowAttributesOrder;
QHash<QString, decltype(m_windowAttributesOrder)::iterator> m_windowAttributes;
@@ -130,11 +130,6 @@
std::unique_ptr<WinIdChangeEventFilter> m_winIdChangeEventFilter;
void removeSystemButtonsAndHitTestItems();
-
- private:
- void _q_titleBarDistroyed(QObject *obj);
- void _q_hitTestVisibleItemDestroyed(QObject *obj);
- void _q_systemButtonDestroyed(QObject *obj);
};
inline QObject *AbstractWindowContext::host() const {
@@ -154,7 +149,7 @@
}
inline bool AbstractWindowContext::isHitTestVisible(const QObject *obj) const {
- return m_hitTestVisibleItems.contains(obj);
+ return m_hitTestVisibleItems.contains(const_cast<QObject *>(obj));
}
inline QObject *
--
Gitblit v1.9.1