From fd8aca4a20f52f696aa239ead1baa20cea5879f6 Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周一, 11 12月 2023 14:58:25 +0800
Subject: [PATCH] Merge pull request #2 from stdware/refactor
---
src/core/contexts/abstractwindowcontext.cpp | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 654f918..d60a6c7 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -2,14 +2,33 @@
namespace QWK {
- AbstractWindowContext::AbstractWindowContext(const QObject *host, const 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() {
- if (m_delegate) {
- delete m_delegate;
+ AbstractWindowContext::~AbstractWindowContext() = default;
+
+ 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;
+
+ if (!setupHost()) {
+ m_host = nullptr;
+ m_delegate = nullptr;
+ m_windowHandle = nullptr;
+ return false;
+ }
+ return true;
}
bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
@@ -41,11 +60,11 @@
return true;
}
- bool AbstractWindowContext::setSystemButton(CoreWindowAgent::SystemButton button,
+ bool AbstractWindowContext::setSystemButton(WindowAgentBase::SystemButton button,
const QObject *obj) {
Q_ASSERT(obj);
- Q_ASSERT(button != CoreWindowAgent::Unknown);
- if (!obj || (button == CoreWindowAgent::Unknown)) {
+ Q_ASSERT(button != WindowAgentBase::Unknown);
+ if (!obj || (button == WindowAgentBase::Unknown)) {
return false;
}
@@ -70,7 +89,7 @@
}
void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
- // ?
+ virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
}
QRegion AbstractWindowContext::hitTestShape() const {
@@ -85,16 +104,16 @@
}
bool AbstractWindowContext::isInSystemButtons(const QPoint &pos,
- CoreWindowAgent::SystemButton *button) const {
- *button = CoreWindowAgent::Unknown;
- for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
+ WindowAgentBase::SystemButton *button) const {
+ *button = WindowAgentBase::Unknown;
+ for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
auto currentButton = m_systemButtons[i];
if (!currentButton || !m_delegate->isVisible(currentButton) ||
!m_delegate->isEnabled(currentButton)) {
continue;
}
if (m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
- *button = static_cast<CoreWindowAgent::SystemButton>(i);
+ *button = static_cast<WindowAgentBase::SystemButton>(i);
return true;
}
}
@@ -123,7 +142,7 @@
return false;
}
- for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
+ for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
auto currentButton = m_systemButtons[i];
if (currentButton && m_delegate->isVisible(currentButton) &&
m_delegate->isEnabled(currentButton) &&
@@ -145,4 +164,17 @@
return true;
}
+ QString AbstractWindowContext::key() const {
+ return {};
+ }
+
+ void AbstractWindowContext::virtual_hook(int id, void *data) {
+ switch (id) {
+ case CentralizeHook:
+ break;
+ default:
+ break;
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1