From 2f6c83c095724bbba0f43b2f2893ba73c17949a6 Mon Sep 17 00:00:00 2001 From: Zhao Yuhang <2546789017@qq.com> Date: 周一, 11 12月 2023 21:57:40 +0800 Subject: [PATCH] add quick border --- src/core/contexts/abstractwindowcontext_p.h | 42 ++++++++++++++++++++++++++++-------------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h index b1202ea..3c04073 100644 --- a/src/core/contexts/abstractwindowcontext_p.h +++ b/src/core/contexts/abstractwindowcontext_p.h @@ -8,19 +8,19 @@ #include <QtGui/QWindow> #include <QtGui/QPolygon> -#include <QWKCore/corewindowagent.h> -#include <QWKCore/windowitemdelegate.h> +#include <QWKCore/windowagentbase.h> +#include <QWKCore/private/windowitemdelegate_p.h> namespace QWK { class QWK_CORE_EXPORT AbstractWindowContext : public QObject { Q_OBJECT public: - AbstractWindowContext(QObject *host, WindowItemDelegate *delegate); + AbstractWindowContext(); ~AbstractWindowContext() override; public: - virtual bool setup() = 0; + bool setup(QObject *host, WindowItemDelegate *delegate); inline QObject *host() const; inline QWindow *window() const; @@ -29,17 +29,31 @@ bool setHitTestVisible(const QObject *obj, bool visible); bool setHitTestVisible(const QRect &rect, bool visible); - inline const QObject *systemButton(CoreWindowAgent::SystemButton button) const; - bool setSystemButton(CoreWindowAgent::SystemButton button, const QObject *obj); + inline QObject *systemButton(WindowAgentBase::SystemButton button) const; + bool setSystemButton(WindowAgentBase::SystemButton button, QObject *obj); - inline const QObject *titleBar() const; - bool setTitleBar(const QObject *obj); + inline QObject *titleBar() const; + bool setTitleBar(QObject *obj); void showSystemMenu(const QPoint &pos); QRegion hitTestShape() const; - bool isInSystemButtons(const QPoint &pos, CoreWindowAgent::SystemButton *button) const; + bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const; bool isInTitleBarDraggableArea(const QPoint &pos) const; + + virtual QString key() const; + + enum WindowContextHook { + CentralizeHook = 1, + ShowSystemMenuHook, + NeedsDrawBordersHook, + DrawBordersHook, + QueryBorderThicknessHook + }; + virtual void virtual_hook(int id, void *data); + + protected: + virtual bool setupHost() = 0; protected: QObject *m_host; @@ -49,8 +63,8 @@ QSet<const QObject *> m_hitTestVisibleItems; QList<QRect> m_hitTestVisibleRects; - const QObject *m_titleBar{}; - std::array<const QObject *, CoreWindowAgent::NumSystemButton> m_systemButtons{}; + QObject *m_titleBar{}; + std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{}; // Cached shape mutable bool hitTestVisibleShapeDirty{}; @@ -69,12 +83,12 @@ return m_hitTestVisibleItems.contains(obj); } - inline const QObject * - AbstractWindowContext::systemButton(CoreWindowAgent::SystemButton button) const { + inline QObject * + AbstractWindowContext::systemButton(WindowAgentBase::SystemButton button) const { return m_systemButtons[button]; } - inline const QObject *AbstractWindowContext::titleBar() const { + inline QObject *AbstractWindowContext::titleBar() const { return m_titleBar; } -- Gitblit v1.9.1