From 6eb2efea00eb07ce3a6b089b984885ce4a08c9ca Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周五, 29 12月 2023 20:55:09 +0800
Subject: [PATCH] Add WinRegKey support

---
 src/core/contexts/abstractwindowcontext_p.h |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index ec4937a..f375b83 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -40,9 +40,6 @@
         inline QWindow *window() const;
         inline WindowItemDelegate *delegate() const;
 
-        inline QVariant windowAttribute(const QString &key) const;
-        bool setWindowAttribute(const QString &key, const QVariant &attribute);
-
         inline bool isHitTestVisible(const QObject *obj) const;
         bool setHitTestVisible(const QObject *obj, bool visible);
 
@@ -53,8 +50,8 @@
         bool setTitleBar(QObject *obj);
 
 #ifdef Q_OS_MAC
-        inline QRect systemButtonArea() const;
-        void setSystemButtonArea(const QRect &rect);
+        inline ScreenRectCallback systemButtonAreaCallback() const;
+        void setSystemButtonAreaCallback(const ScreenRectCallback &callback);
 #endif
 
         bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const;
@@ -76,6 +73,9 @@
         void showSystemMenu(const QPoint &pos);
         void notifyWinIdChange();
 
+        virtual QVariant windowAttribute(const QString &key) const;
+        virtual bool setWindowAttribute(const QString &key, const QVariant &attribute);
+
     protected:
         virtual void winIdChanged() = 0;
         virtual bool windowAttributeChanged(const QString &key, const QVariant &attribute,
@@ -88,7 +88,7 @@
 
         QSet<const QObject *> m_hitTestVisibleItems;
 #ifdef Q_OS_MAC
-        QRect m_systemButtonArea;
+        ScreenRectCallback m_systemButtonAreaCallback;
 #endif
 
         QObject *m_titleBar{};
@@ -112,10 +112,6 @@
         return m_delegate.get();
     }
 
-    inline QVariant AbstractWindowContext::windowAttribute(const QString &key) const {
-        return m_windowAttributes.value(key);
-    }
-
     inline bool AbstractWindowContext::isHitTestVisible(const QObject *obj) const {
         return m_hitTestVisibleItems.contains(obj);
     }
@@ -130,8 +126,8 @@
     }
 
 #ifdef Q_OS_MAC
-    inline QRect AbstractWindowContext::systemButtonArea() const {
-        return m_systemButtonArea;
+    inline ScreenRectCallback AbstractWindowContext::systemButtonAreaCallback() const {
+        return m_systemButtonAreaCallback;
     }
 #endif
 

--
Gitblit v1.9.1