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 | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h index f3e05a1..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(); @@ -61,7 +64,8 @@ RaiseWindowHook, ShowSystemMenuHook, DefaultColorsHook, - DrawWindows10BorderHook, // Only works on Windows 10 + DrawWindows10BorderHook, // Only works on Windows 10, emulated workaround + DrawWindows10BorderHook2, // Only works on Windows 10, native workaround SystemButtonAreaChangedHook, // Only works on Mac }; virtual void virtual_hook(int id, void *data); @@ -69,8 +73,13 @@ 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, + const QVariant &oldAttribute); protected: QObject *m_host{}; @@ -83,8 +92,11 @@ #endif QObject *m_titleBar{}; - std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{}; + std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{}; + QVariantHash m_windowAttributes; + + std::unique_ptr<QObject> m_windowEventFilter; std::unique_ptr<QObject> m_winIdChangeEventFilter; }; -- Gitblit v1.9.1