From c8a5a82994e513acb00ba0e1f0b882ccbb18a6db Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周二, 26 12月 2023 05:15:47 +0800 Subject: [PATCH] clean code --- src/core/contexts/abstractwindowcontext_p.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h index f8ea17e..04651ad 100644 --- a/src/core/contexts/abstractwindowcontext_p.h +++ b/src/core/contexts/abstractwindowcontext_p.h @@ -20,11 +20,14 @@ #include <QWKCore/windowagentbase.h> #include <QWKCore/private/nativeeventfilter_p.h> +#include <QWKCore/private/sharedeventfilter_p.h> #include <QWKCore/private/windowitemdelegate_p.h> namespace QWK { - class QWK_CORE_EXPORT AbstractWindowContext : public QObject, public NativeEventDispatcher { + class QWK_CORE_EXPORT AbstractWindowContext : public QObject, + public NativeEventDispatcher, + public SharedEventDispatcher { Q_OBJECT public: AbstractWindowContext(); @@ -36,9 +39,6 @@ inline QObject *host() const; 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); @@ -73,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, @@ -93,6 +96,7 @@ QVariantHash m_windowAttributes; + std::unique_ptr<QObject> m_windowEventFilter; std::unique_ptr<QObject> m_winIdChangeEventFilter; }; @@ -106,10 +110,6 @@ inline WindowItemDelegate *AbstractWindowContext::delegate() const { 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 { -- Gitblit v1.9.1