From 1a1f26d9e4ab6a4fe51baa78e40c4cdf3f402bcf Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: ćšć, 07 12æ 2023 14:27:00 +0800 Subject: [PATCH] Add context factory --- src/core/contexts/abstractwindowcontext_p.h | 55 +++++++++++++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 22 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h index fd3a445..a73f7c4 100644 --- a/src/core/contexts/abstractwindowcontext_p.h +++ b/src/core/contexts/abstractwindowcontext_p.h @@ -1,6 +1,9 @@ #ifndef ABSTRACTWINDOWCONTEXT_P_H #define ABSTRACTWINDOWCONTEXT_P_H +#include <array> +#include <memory> + #include <QtCore/QSet> #include <QtGui/QWindow> #include <QtGui/QPolygon> @@ -13,57 +16,65 @@ class QWK_CORE_EXPORT AbstractWindowContext : public QObject { Q_OBJECT public: - inline AbstractWindowContext(QWindow *window, WindowItemDelegate *delegate) - : m_windowHandle(window), m_delegate(delegate) { - } - ~AbstractWindowContext(); + AbstractWindowContext(); + ~AbstractWindowContext() override; public: - virtual bool setup() = 0; + virtual bool setup(QObject *host, WindowItemDelegate *delegate); + inline QObject *host() const; inline QWindow *window() const; - void setupWindow(QWindow *window); - inline bool isHitTestVisible(QObject *obj) const; - bool setHitTestVisible(QObject *obj, bool visible); + inline bool isHitTestVisible(const QObject *obj) const; + bool setHitTestVisible(const QObject *obj, bool visible); bool setHitTestVisible(const QRect &rect, bool visible); - inline QObject *systemButton(CoreWindowAgent::SystemButton button) const; - bool setSystemButton(CoreWindowAgent::SystemButton button, QObject *obj); + inline const QObject *systemButton(CoreWindowAgent::SystemButton button) const; + bool setSystemButton(CoreWindowAgent::SystemButton button, const QObject *obj); - inline QObject *titleBar() const; - bool setTitleBar(QObject *obj); + inline const QObject *titleBar() const; + bool setTitleBar(const QObject *obj); void showSystemMenu(const QPoint &pos); - protected: - QWindow *m_windowHandle; - WindowItemDelegate *m_delegate; + QRegion hitTestShape() const; + bool isInSystemButtons(const QPoint &pos, CoreWindowAgent::SystemButton *button) const; + bool isInTitleBarDraggableArea(const QPoint &pos) const; - QSet<QObject *> m_hitTestVisibleItems; + protected: + QObject *m_host; + std::unique_ptr<WindowItemDelegate> m_delegate; + QWindow *m_windowHandle; + + QSet<const QObject *> m_hitTestVisibleItems; QList<QRect> m_hitTestVisibleRects; - QObject *m_titleBar{}; - QObject *m_systemButtons[CoreWindowAgent::NumSystemButton]{}; + const QObject *m_titleBar{}; + std::array<const QObject *, CoreWindowAgent::NumSystemButton> m_systemButtons{}; + // Cached shape mutable bool hitTestVisibleShapeDirty{}; - mutable QPolygon hitTestVisibleShape; + mutable QRegion hitTestVisibleShape; }; + + inline QObject *AbstractWindowContext::host() const { + return m_host; + } inline QWindow *AbstractWindowContext::window() const { return m_windowHandle; } - inline bool AbstractWindowContext::isHitTestVisible(QObject *obj) const { + inline bool AbstractWindowContext::isHitTestVisible(const QObject *obj) const { return m_hitTestVisibleItems.contains(obj); } - inline QObject * + inline const QObject * AbstractWindowContext::systemButton(CoreWindowAgent::SystemButton button) const { return m_systemButtons[button]; } - inline QObject *AbstractWindowContext::titleBar() const { + inline const QObject *AbstractWindowContext::titleBar() const { return m_titleBar; } -- Gitblit v1.9.1