From ac1a62b2a76e4d15e412b9579b80da2dafbc6d6a Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周一, 19 5月 2025 15:38:12 +0800
Subject: [PATCH] Update qmsetup
---
src/core/contexts/abstractwindowcontext_p.h | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index e2b8f4b..dc18f37 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -15,7 +15,9 @@
//
#include <array>
+#include <list>
#include <memory>
+#include <utility>
#include <QtCore/QSet>
#include <QtCore/QPointer>
@@ -47,7 +49,7 @@
inline WindowItemDelegate *delegate() const;
inline bool isHitTestVisible(const QObject *obj) const;
- bool setHitTestVisible(const QObject *obj, bool visible);
+ bool setHitTestVisible(QObject *obj, bool visible);
inline QObject *systemButton(WindowAgentBase::SystemButton button) const;
bool setSystemButton(WindowAgentBase::SystemButton button, QObject *obj);
@@ -88,9 +90,9 @@
RaiseWindowHook,
ShowSystemMenuHook,
DefaultColorsHook,
- DrawWindows10BorderHook, // Only works on Windows 10, emulated workaround
- DrawWindows10BorderHook2, // Only works on Windows 10, native workaround
- SystemButtonAreaChangedHook, // Only works on Mac
+ DrawWindows10BorderHook_Emulated, // Only works on Windows 10, emulated workaround
+ DrawWindows10BorderHook_Native, // Only works on Windows 10, native workaround
+ SystemButtonAreaChangedHook, // Only works on Mac
};
virtual void virtual_hook(int id, void *data);
@@ -114,16 +116,20 @@
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{};
- QVariantHash m_windowAttributes;
+ std::list<std::pair<QString, QVariant>> m_windowAttributesOrder;
+ QHash<QString, decltype(m_windowAttributesOrder)::iterator> m_windowAttributes;
+
std::unique_ptr<WinIdChangeEventFilter> m_winIdChangeEventFilter;
+
+ void removeSystemButtonsAndHitTestItems();
};
inline QObject *AbstractWindowContext::host() const {
@@ -143,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