From 6945a197490e7aa0113bca1f9a13019a27b5d8eb Mon Sep 17 00:00:00 2001 From: Joker <joker2387089590@gmail.com> Date: 周三, 18 6月 2025 23:10:25 +0800 Subject: [PATCH] change submodule url --- 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