From 05fedeedb28df769ce16efea39be1cc5e2916b98 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: 周三, 06 12月 2023 14:13:01 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/abstractwindowcontext.cpp | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 5150203..1c0e739 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -8,7 +8,7 @@
AbstractWindowContext::~AbstractWindowContext() = default;
- bool AbstractWindowContext::setHitTestVisible(QObject *obj, bool visible) {
+ bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
Q_ASSERT(obj);
if (!obj) {
return false;
@@ -38,7 +38,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 +52,7 @@
return true;
}
- bool AbstractWindowContext::setTitleBar(QObject *item) {
+ bool AbstractWindowContext::setTitleBar(const QObject *item) {
Q_ASSERT(item);
if (!item) {
return false;
@@ -90,7 +90,7 @@
continue;
}
if (m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
- *button = CoreWindowAgent::WindowIcon;
+ *button = static_cast<CoreWindowAgent::SystemButton>(i);
return true;
}
}
@@ -115,6 +115,10 @@
return false;
}
+ if (!titleBarRect.contains(pos)) {
+ return false;
+ }
+
for (int i = CoreWindowAgent::WindowIcon; i <= CoreWindowAgent::Close; ++i) {
auto currentButton = m_systemButtons[i];
if (currentButton && m_delegate->isVisible(currentButton) &&
@@ -134,7 +138,6 @@
if (!m_hitTestVisibleRects.isEmpty() && hitTestShape().contains(pos)) {
return false;
}
-
return true;
}
--
Gitblit v1.9.1