From 7d747f3bb139d2c01aee61b809d0929e8e908a2d Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周六, 23 12月 2023 17:41:00 +0800
Subject: [PATCH] update qmsetup
---
src/core/contexts/abstractwindowcontext_p.h | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 1882369..fec421e 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -38,7 +38,7 @@
inline WindowItemDelegate *delegate() const;
inline QVariant windowAttribute(const QString &key) const;
- void setWindowAttribute(const QString &key, const QVariant &var);
+ bool setWindowAttribute(const QString &key, const QVariant &attribute);
inline bool isHitTestVisible(const QObject *obj) const;
bool setHitTestVisible(const QObject *obj, bool visible);
@@ -64,7 +64,6 @@
RaiseWindowHook,
ShowSystemMenuHook,
DefaultColorsHook,
- WindowAttributeChangedHook,
DrawWindows10BorderHook, // Only works on Windows 10
SystemButtonAreaChangedHook, // Only works on Mac
};
@@ -73,11 +72,10 @@
void showSystemMenu(const QPoint &pos);
void notifyWinIdChange();
- inline bool isEnabled() const;
- void setEnabled(bool enabled);
-
protected:
- virtual void winIdChanged(QWindow *oldWindow, bool isDestroyed) = 0;
+ virtual void winIdChanged() = 0;
+ virtual bool windowAttributeChanged(const QString &key, const QVariant &attribute,
+ const QVariant &oldAttribute);
protected:
QObject *m_host{};
@@ -94,9 +92,7 @@
QVariantHash m_windowAttributes;
- private:
- bool m_internalEnabled = false;
- QPointer<QWindow> m_windowHandleCache;
+ std::unique_ptr<QObject> m_winIdChangeEventFilter;
};
inline QObject *AbstractWindowContext::host() const {
@@ -133,10 +129,6 @@
return m_systemButtonArea;
}
#endif
-
- inline bool AbstractWindowContext::isEnabled() const {
- return m_internalEnabled;
- }
}
--
Gitblit v1.9.1