From 364f4aec17e88adb5a0f3faad28176fc7cb89c74 Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周四, 14 12月 2023 20:06:49 +0800
Subject: [PATCH] macos cleanup

---
 src/quick/quickwindowagent.h |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/quick/quickwindowagent.h b/src/quick/quickwindowagent.h
index ef26eea..0d60a7a 100644
--- a/src/quick/quickwindowagent.h
+++ b/src/quick/quickwindowagent.h
@@ -4,43 +4,46 @@
 #include <QtQuick/QQuickItem>
 #include <QtQuick/QQuickWindow>
 
-#include <QWKCore/corewindowagent.h>
+#include <QWKCore/windowagentbase.h>
 #include <QWKQuick/qwkquickglobal.h>
 
 namespace QWK {
 
     class QuickWindowAgentPrivate;
 
-    class QWK_QUICK_EXPORT QuickWindowAgent : public CoreWindowAgent {
+    class QWK_QUICK_EXPORT QuickWindowAgent : public WindowAgentBase {
         Q_OBJECT
-        Q_DISABLE_COPY(QuickWindowAgent)
         Q_DECLARE_PRIVATE(QuickWindowAgent)
-
     public:
         explicit QuickWindowAgent(QObject *parent = nullptr);
         ~QuickWindowAgent() override;
 
     public:
-        bool setup(QQuickWindow *window);
+        Q_INVOKABLE bool setup(QQuickWindow *window);
 
-        bool isHitTestVisible(QQuickItem *item) const;
-        void setHitTestVisible(QQuickItem *item, bool visible);
-        void setHitTestVisible(const QRect &rect, bool visible);
+        Q_INVOKABLE QQuickItem *titleBar() const;
+        Q_INVOKABLE void setTitleBar(QQuickItem *item);
 
-        QQuickItem *systemButton(SystemButton button) const;
-        void setSystemButton(SystemButton button, QQuickItem *item);
+        Q_INVOKABLE QQuickItem *systemButton(SystemButton button) const;
+        Q_INVOKABLE void setSystemButton(SystemButton button, QQuickItem *item);
 
-        QQuickItem *titleBar() const;
-        void setTitleBar(QQuickItem *item);
+        Q_INVOKABLE bool isHitTestVisible(const QQuickItem *item) const;
+        Q_INVOKABLE inline void setHitTestVisible(const QQuickItem *item, bool visible = true);
+        Q_INVOKABLE void setHitTestVisible_item(const QQuickItem *item, bool visible = true);
+        Q_INVOKABLE void setHitTestVisible_rect(const QRect &rect, bool visible = true);
 
     Q_SIGNALS:
-        void titleBarWidgetChanged(QQuickItem *item);
-        void systemButtonChanged(SystemButton button, QQuickItem *item);
+        void titleBarWidgetChanged(const QQuickItem *item);
+        void systemButtonChanged(SystemButton button, const QQuickItem *item);
 
     protected:
         QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent = nullptr);
     };
 
+    inline void QuickWindowAgent::setHitTestVisible(const QQuickItem *item, bool visible) {
+        setHitTestVisible_item(item, visible);
+    }
+
 }
 
 #endif // QUICKWINDOWAGENT_H
\ No newline at end of file

--
Gitblit v1.9.1