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 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 5c75d28..a3e1680 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -2,15 +2,11 @@
namespace QWK {
- AbstractWindowContext::~AbstractWindowContext() = default;
-
- void AbstractWindowContext::setupWindow(QWindow *window) {
- Q_ASSERT(window);
- if (!window) {
- return;
- }
- m_windowHandle = window;
+ AbstractWindowContext::AbstractWindowContext(QObject *host, WindowItemDelegate *delegate)
+ : m_host(host), m_delegate(delegate), m_windowHandle(delegate->hostWindow(host)) {
}
+
+ AbstractWindowContext::~AbstractWindowContext() = default;
bool AbstractWindowContext::setHitTestVisible(QObject *obj, bool visible) {
Q_ASSERT(obj);
@@ -101,4 +97,48 @@
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 (!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) &&
+ 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;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1