From 0287f19b3eabf6b6632d51c0288e6cf0be2c5e69 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: 周三, 06 12月 2023 18:04:31 +0800
Subject: [PATCH] update pointer usage
---
src/core/contexts/abstractwindowcontext.cpp | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 5150203..d0d6ebb 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -2,13 +2,13 @@
namespace QWK {
- AbstractWindowContext::AbstractWindowContext(QObject *host, WindowItemDelegate *delegate)
+ AbstractWindowContext::AbstractWindowContext(const QObject *host, const WindowItemDelegate *delegate)
: m_host(host), m_delegate(delegate), m_windowHandle(delegate->hostWindow(host)) {
}
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