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 | 65 ++++++++++++++++++++++++++------ 1 files changed, 53 insertions(+), 12 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h index 275caa9..04651ad 100644 --- a/src/core/contexts/abstractwindowcontext_p.h +++ b/src/core/contexts/abstractwindowcontext_p.h @@ -1,33 +1,47 @@ #ifndef ABSTRACTWINDOWCONTEXT_P_H #define ABSTRACTWINDOWCONTEXT_P_H +// +// W A R N I N G !!! +// ----------------- +// +// This file is not part of the QWindowKit API. It is used purely as an +// implementation detail. This header file may change from version to +// version without notice, or may even be removed. +// + #include <array> #include <memory> #include <QtCore/QSet> +#include <QtCore/QPointer> +#include <QtGui/QRegion> #include <QtGui/QWindow> -#include <QtGui/QPolygon> #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 { + class QWK_CORE_EXPORT AbstractWindowContext : public QObject, + public NativeEventDispatcher, + public SharedEventDispatcher { Q_OBJECT public: AbstractWindowContext(); ~AbstractWindowContext() override; public: - bool setup(QObject *host, WindowItemDelegate *delegate); + void setup(QObject *host, WindowItemDelegate *delegate); inline QObject *host() const; inline QWindow *window() const; + inline WindowItemDelegate *delegate() const; inline bool isHitTestVisible(const QObject *obj) const; bool setHitTestVisible(const QObject *obj, bool visible); - bool setHitTestVisible(const QRect &rect, bool visible); inline QObject *systemButton(WindowAgentBase::SystemButton button) const; bool setSystemButton(WindowAgentBase::SystemButton button, QObject *obj); @@ -35,9 +49,11 @@ inline QObject *titleBar() const; bool setTitleBar(QObject *obj); - void showSystemMenu(const QPoint &pos); +#ifdef Q_OS_MAC + inline QRect systemButtonArea() const; + void setSystemButtonArea(const QRect &rect); +#endif - QRegion hitTestShape() const; bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const; bool isInTitleBarDraggableArea(const QPoint &pos) const; @@ -45,13 +61,25 @@ enum WindowContextHook { CentralizeHook = 1, + RaiseWindowHook, ShowSystemMenuHook, DefaultColorsHook, + 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); + 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 bool setupHost() = 0; + virtual void winIdChanged() = 0; + virtual bool windowAttributeChanged(const QString &key, const QVariant &attribute, + const QVariant &oldAttribute); protected: QObject *m_host{}; @@ -59,14 +87,17 @@ QWindow *m_windowHandle{}; QSet<const QObject *> m_hitTestVisibleItems; - QList<QRect> m_hitTestVisibleRects; +#ifdef Q_OS_MAC + QRect m_systemButtonArea; +#endif QObject *m_titleBar{}; - std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{}; + std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{}; - // Cached shape - mutable bool hitTestVisibleShapeDirty{}; - mutable QRegion hitTestVisibleShape; + QVariantHash m_windowAttributes; + + std::unique_ptr<QObject> m_windowEventFilter; + std::unique_ptr<QObject> m_winIdChangeEventFilter; }; inline QObject *AbstractWindowContext::host() const { @@ -75,6 +106,10 @@ inline QWindow *AbstractWindowContext::window() const { return m_windowHandle; + } + + inline WindowItemDelegate *AbstractWindowContext::delegate() const { + return m_delegate.get(); } inline bool AbstractWindowContext::isHitTestVisible(const QObject *obj) const { @@ -90,6 +125,12 @@ return m_titleBar; } +#ifdef Q_OS_MAC + inline QRect AbstractWindowContext::systemButtonArea() const { + return m_systemButtonArea; + } +#endif + } #endif // ABSTRACTWINDOWCONTEXT_P_H -- Gitblit v1.9.1