From 8e6cc97cc705bbc4a88a7803a3f48640e373e469 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 06 12月 2023 10:50:37 +0800
Subject: [PATCH] Fix title bar draggable mistake
---
src/core/contexts/abstractwindowcontext.cpp | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 5329634..a3e1680 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -2,20 +2,11 @@
namespace QWK {
- AbstractWindowContext::AbstractWindowContext(QWindow *window, WindowItemDelegate *delegate)
- : m_windowHandle(window), m_delegate(delegate) {
+ AbstractWindowContext::AbstractWindowContext(QObject *host, WindowItemDelegate *delegate)
+ : m_host(host), m_delegate(delegate), m_windowHandle(delegate->hostWindow(host)) {
}
- AbstractWindowContext::~AbstractWindowContext() {
- }
-
- void AbstractWindowContext::setupWindow(QWindow *window) {
- Q_ASSERT(window);
- if (!window) {
- return;
- }
- m_windowHandle = window;
- }
+ AbstractWindowContext::~AbstractWindowContext() = default;
bool AbstractWindowContext::setHitTestVisible(QObject *obj, bool visible) {
Q_ASSERT(obj);
@@ -124,6 +115,10 @@
return false;
}
+ if (!m_delegate->mapGeometryToScene(m_titleBar).contains(pos)) {
+ return false;
+ }
+
for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
auto currentButton = m_systemButtons[i];
if (currentButton && m_delegate->isVisible(currentButton) &&
@@ -140,10 +135,9 @@
}
}
- if (hitTestShape().contains(pos)) {
+ if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) {
return false;
}
-
return true;
}
--
Gitblit v1.9.1