From 39ba3049f01b30c9a99ad8bb8cd94e117d1c3c65 Mon Sep 17 00:00:00 2001 From: SineStriker <trueful@163.com> Date: ćšć, 28 12æ 2023 20:54:27 +0800 Subject: [PATCH] Fix mistakes of quick module --- src/quick/quickwindowagent.h | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/quick/quickwindowagent.h b/src/quick/quickwindowagent.h index ef26eea..58703a8 100644 --- a/src/quick/quickwindowagent.h +++ b/src/quick/quickwindowagent.h @@ -4,38 +4,40 @@ #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 void setHitTestVisible(const QQuickItem *item, bool visible = true); + +#ifdef Q_OS_MAC + QQuickItem *systemButtonArea() const; + void setSystemButtonArea(QQuickItem *item); +#endif 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); -- Gitblit v1.9.1