From 52a662ed17db6c3a3ff2050d61bc2e06ea21b056 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周日, 17 12月 2023 01:07:13 +0800 Subject: [PATCH] Add Mac system button area interfaces --- src/core/contexts/abstractwindowcontext_p.h | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h index be5ab36..a86ddd8 100644 --- a/src/core/contexts/abstractwindowcontext_p.h +++ b/src/core/contexts/abstractwindowcontext_p.h @@ -36,6 +36,11 @@ inline QObject *titleBar() const; bool setTitleBar(QObject *obj); +#ifdef Q_OS_MAC + inline QRect systemButtonArea() const; + void setSystemButtonArea(const QRect &rect); +#endif + bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const; bool isInTitleBarDraggableArea(const QPoint &pos) const; @@ -45,7 +50,8 @@ CentralizeHook = 1, ShowSystemMenuHook, DefaultColorsHook, - DrawWindows10BorderHook, // Only works on Windows 10 + DrawWindows10BorderHook, // Only works on Windows 10 + SystemButtonAreaChangedHook, // Only works on Mac }; virtual void virtual_hook(int id, void *data); @@ -60,6 +66,9 @@ QWindow *m_windowHandle{}; QSet<const QObject *> m_hitTestVisibleItems; +#ifdef Q_OS_MAC + QRect m_systemButtonArea; +#endif QObject *m_titleBar{}; std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{}; @@ -90,6 +99,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