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.cpp | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp index 9e0d7cd..679a9ee 100644 --- a/src/core/contexts/abstractwindowcontext.cpp +++ b/src/core/contexts/abstractwindowcontext.cpp @@ -2,13 +2,29 @@ namespace QWK { - AbstractWindowContext::AbstractWindowContext(QObject *host, WindowItemDelegate *delegate) - : m_host(host), m_delegate(delegate), m_windowHandle(delegate->hostWindow(host)) { + AbstractWindowContext::AbstractWindowContext() + : m_host(nullptr), m_delegate(nullptr), m_windowHandle(nullptr) { } AbstractWindowContext::~AbstractWindowContext() = default; - bool AbstractWindowContext::setHitTestVisible(QObject *obj, bool visible) { + bool AbstractWindowContext::setup(QObject *host, WindowItemDelegate *delegate) { + if (!host || !delegate) { + return false; + } + + auto windowHandle = delegate->hostWindow(host); + if (!windowHandle) { + return false; + } + + m_host = host; + m_delegate.reset(delegate); + m_windowHandle = windowHandle; + return true; + } + + bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) { Q_ASSERT(obj); if (!obj) { return false; @@ -38,7 +54,7 @@ } bool AbstractWindowContext::setSystemButton(CoreWindowAgent::SystemButton button, - QObject *obj) { + const QObject *obj) { Q_ASSERT(obj); Q_ASSERT(button != CoreWindowAgent::Unknown); if (!obj || (button == CoreWindowAgent::Unknown)) { @@ -52,7 +68,7 @@ return true; } - bool AbstractWindowContext::setTitleBar(QObject *item) { + bool AbstractWindowContext::setTitleBar(const QObject *item) { Q_ASSERT(item); if (!item) { return false; @@ -90,7 +106,7 @@ continue; } if (m_delegate->mapGeometryToScene(currentButton).contains(pos)) { - *button = CoreWindowAgent::WindowIcon; + *button = static_cast<CoreWindowAgent::SystemButton>(i); return true; } } -- Gitblit v1.9.1