From ad494e6b019b9fea2daf3aa8ff17b37f79554528 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: 周一, 11 12月 2023 15:04:31 +0800
Subject: [PATCH] fix QML & Qt6
---
src/core/contexts/abstractwindowcontext.cpp | 114 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 95 insertions(+), 19 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 5c75d28..d60a6c7 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -2,17 +2,36 @@
namespace QWK {
- AbstractWindowContext::~AbstractWindowContext() = default;
-
- void AbstractWindowContext::setupWindow(QWindow *window) {
- Q_ASSERT(window);
- if (!window) {
- return;
- }
- m_windowHandle = window;
+ AbstractWindowContext::AbstractWindowContext()
+ : m_host(nullptr), m_delegate(nullptr), m_windowHandle(nullptr) {
}
- bool AbstractWindowContext::setHitTestVisible(QObject *obj, bool visible) {
+ 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) {
Q_ASSERT(obj);
if (!obj) {
return false;
@@ -41,11 +60,11 @@
return true;
}
- bool AbstractWindowContext::setSystemButton(CoreWindowAgent::SystemButton button,
- QObject *obj) {
+ 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;
}
@@ -56,7 +75,7 @@
return true;
}
- bool AbstractWindowContext::setTitleBar(QObject *item) {
+ bool AbstractWindowContext::setTitleBar(const QObject *item) {
Q_ASSERT(item);
if (!item) {
return false;
@@ -70,7 +89,7 @@
}
void AbstractWindowContext::showSystemMenu(const QPoint &pos) {
- // ?
+ virtual_hook(ShowSystemMenuHook, &const_cast<QPoint &>(pos));
}
QRegion AbstractWindowContext::hitTestShape() const {
@@ -85,20 +104,77 @@
}
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 = CoreWindowAgent::WindowIcon;
+ *button = static_cast<WindowAgentBase::SystemButton>(i);
return true;
}
}
return false;
}
+ bool AbstractWindowContext::isInTitleBarDraggableArea(const QPoint &pos) const {
+ if (!m_titleBar) {
+ // There's no title bar at all, the mouse will always be in the client area.
+ return false;
+ }
+ if (!m_delegate->isVisible(m_titleBar) || !m_delegate->isEnabled(m_titleBar)) {
+ // The title bar is hidden or disabled for some reason, treat it as there's
+ // no title bar.
+ return false;
+ }
+ QRect windowRect = {QPoint(0, 0), m_windowHandle->size()};
+ QRect titleBarRect = m_delegate->mapGeometryToScene(m_titleBar);
+ if (!titleBarRect.intersects(windowRect)) {
+ // The title bar is totally outside the window for some reason,
+ // also treat it as there's no title bar.
+ return false;
+ }
+
+ if (!titleBarRect.contains(pos)) {
+ return false;
+ }
+
+ for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
+ auto currentButton = m_systemButtons[i];
+ if (currentButton && m_delegate->isVisible(currentButton) &&
+ m_delegate->isEnabled(currentButton) &&
+ m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
+ return false;
+ }
+ }
+
+ for (auto widget : m_hitTestVisibleItems) {
+ if (widget && m_delegate->isVisible(widget) && m_delegate->isEnabled(widget) &&
+ m_delegate->mapGeometryToScene(widget).contains(pos)) {
+ return false;
+ }
+ }
+
+ if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) {
+ return false;
+ }
+ 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