From 86403b4e99f901f687050ce9a91a8e539331cebb Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <zhaoyuhang@rankyee.com>
Date: ćšć, 07 12æ 2023 17:39:55 +0800
Subject: [PATCH] remove not needed result
---
src/core/windowitemdelegate.h | 2 +-
src/core/windowitemdelegate.cpp | 4 +---
src/widgets/widgetitemdelegate.cpp | 21 ++++++++++-----------
src/widgets/widgetitemdelegate_p.h | 2 +-
src/core/contexts/win32windowcontext.cpp | 4 ++--
5 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 1201277..b89496c 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -869,7 +869,7 @@
const WindowPart currentWindowPart = lastHitTestResult;
if (message == WM_NCMOUSEMOVE) {
if (currentWindowPart != WindowPart::ChromeButton) {
- std::ignore = m_delegate->resetQtGrabbedControl();
+ m_delegate->resetQtGrabbedControl();
if (mouseLeaveBlocked) {
emulateClientAreaMessage(hWnd, message, wParam, lParam,
WM_NCMOUSELEAVE);
@@ -931,7 +931,7 @@
// window from client area, which means we will get previous window part as
// HTCLIENT if the mouse leaves window from client area and enters window
// from non-client area, but it has no bad effect.
- std::ignore = m_delegate->resetQtGrabbedControl();
+ m_delegate->resetQtGrabbedControl();
}
}
break;
diff --git a/src/core/windowitemdelegate.cpp b/src/core/windowitemdelegate.cpp
index 552310d..1539b3f 100644
--- a/src/core/windowitemdelegate.cpp
+++ b/src/core/windowitemdelegate.cpp
@@ -6,8 +6,6 @@
WindowItemDelegate::~WindowItemDelegate() = default;
- bool WindowItemDelegate::resetQtGrabbedControl() const {
- return true;
- }
+ void WindowItemDelegate::resetQtGrabbedControl() const {}
}
\ No newline at end of file
diff --git a/src/core/windowitemdelegate.h b/src/core/windowitemdelegate.h
index 7d7e6d1..58dba1d 100644
--- a/src/core/windowitemdelegate.h
+++ b/src/core/windowitemdelegate.h
@@ -26,7 +26,7 @@
virtual bool isHostSizeFixed(const QObject *host) const = 0;
// Callbacks
- virtual bool resetQtGrabbedControl() const;
+ virtual void resetQtGrabbedControl() const;
private:
Q_DISABLE_COPY_MOVE(WindowItemDelegate)
diff --git a/src/widgets/widgetitemdelegate.cpp b/src/widgets/widgetitemdelegate.cpp
index 6378f36..186516d 100644
--- a/src/widgets/widgetitemdelegate.cpp
+++ b/src/widgets/widgetitemdelegate.cpp
@@ -56,18 +56,17 @@
return false;
}
- bool WidgetItemDelegate::resetQtGrabbedControl() const {
- if (qt_button_down) {
- static constexpr const auto invalidPos = QPoint{std::numeric_limits<int>::lowest(), std::numeric_limits<int>::lowest()};
- const auto event =
- new QMouseEvent(QEvent::MouseButtonRelease, invalidPos, invalidPos, invalidPos,
- Qt::LeftButton, QGuiApplication::mouseButtons() ^ Qt::LeftButton,
- QGuiApplication::keyboardModifiers());
- QApplication::postEvent(qt_button_down, event);
- qt_button_down = nullptr;
- return true;
+ void WidgetItemDelegate::resetQtGrabbedControl() const {
+ if (!qt_button_down) {
+ return;
}
- return false;
+ static constexpr const auto invalidPos = QPoint{std::numeric_limits<int>::lowest(), std::numeric_limits<int>::lowest()};
+ const auto event =
+ new QMouseEvent(QEvent::MouseButtonRelease, invalidPos, invalidPos, invalidPos,
+ Qt::LeftButton, QGuiApplication::mouseButtons() ^ Qt::LeftButton,
+ QGuiApplication::keyboardModifiers());
+ QApplication::postEvent(qt_button_down, event);
+ qt_button_down = nullptr;
}
}
\ No newline at end of file
diff --git a/src/widgets/widgetitemdelegate_p.h b/src/widgets/widgetitemdelegate_p.h
index e5264e9..1056f35 100644
--- a/src/widgets/widgetitemdelegate_p.h
+++ b/src/widgets/widgetitemdelegate_p.h
@@ -23,7 +23,7 @@
QWindow * hostWindow(const QObject *host) const override;
bool isHostSizeFixed(const QObject *host) const override;
- bool resetQtGrabbedControl() const override;
+ void resetQtGrabbedControl() const override;
};
}
--
Gitblit v1.9.1