diff --git a/include/FramelessHelper/Widgets/framelesswidgetshelper.h b/include/FramelessHelper/Widgets/framelesswidgetshelper.h index b26664e..85be054 100644 --- a/include/FramelessHelper/Widgets/framelesswidgetshelper.h +++ b/include/FramelessHelper/Widgets/framelesswidgetshelper.h @@ -62,7 +62,7 @@ public: Q_INVOKABLE void showEventHandler(QShowEvent *event); Q_INVOKABLE void changeEventHandler(QEvent *event); Q_INVOKABLE void paintEventHandler(QPaintEvent *event); - Q_INVOKABLE void mousePressEventHandler(QMouseEvent *event); + Q_INVOKABLE void mouseMoveEventHandler(QMouseEvent *event); Q_INVOKABLE void mouseReleaseEventHandler(QMouseEvent *event); Q_INVOKABLE void mouseDoubleClickEventHandler(QMouseEvent *event); diff --git a/src/quick/framelessquickwindow.cpp b/src/quick/framelessquickwindow.cpp index 1becd6a..f4e231e 100644 --- a/src/quick/framelessquickwindow.cpp +++ b/src/quick/framelessquickwindow.cpp @@ -280,9 +280,9 @@ bool FramelessQuickWindowPrivate::eventFilter(QObject *object, QEvent *event) const auto showEvent = static_cast(event); showEventHandler(showEvent); } break; - case QEvent::MouseButtonPress: { + case QEvent::MouseMove: { const auto mouseEvent = static_cast(event); - mousePressEventHandler(mouseEvent); + mouseMoveEventHandler(mouseEvent); } break; case QEvent::MouseButtonRelease: { const auto mouseEvent = static_cast(event); @@ -550,7 +550,7 @@ void FramelessQuickWindowPrivate::showEventHandler(QShowEvent *event) } } -void FramelessQuickWindowPrivate::mousePressEventHandler(QMouseEvent *event) +void FramelessQuickWindowPrivate::mouseMoveEventHandler(QMouseEvent *event) { Q_ASSERT(event); if (!event) { @@ -559,9 +559,6 @@ void FramelessQuickWindowPrivate::mousePressEventHandler(QMouseEvent *event) if (m_settings.options & Option::DisableDragging) { return; } - if (event->button() != Qt::LeftButton) { - return; - } #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) const QPoint scenePos = event->scenePosition().toPoint(); #else diff --git a/src/quick/framelessquickwindow_p.h b/src/quick/framelessquickwindow_p.h index 5c12c21..556722d 100644 --- a/src/quick/framelessquickwindow_p.h +++ b/src/quick/framelessquickwindow_p.h @@ -63,7 +63,7 @@ public: Q_INVOKABLE Q_NODISCARD QQuickAnchorLine getTopBorderVerticalCenter() const; Q_INVOKABLE void showEventHandler(QShowEvent *event); - Q_INVOKABLE void mousePressEventHandler(QMouseEvent *event); + Q_INVOKABLE void mouseMoveEventHandler(QMouseEvent *event); Q_INVOKABLE void mouseReleaseEventHandler(QMouseEvent *event); Q_INVOKABLE void mouseDoubleClickEventHandler(QMouseEvent *event); diff --git a/src/widgets/framelesswidgetshelper.cpp b/src/widgets/framelesswidgetshelper.cpp index 631db02..4e812f0 100644 --- a/src/widgets/framelesswidgetshelper.cpp +++ b/src/widgets/framelesswidgetshelper.cpp @@ -260,7 +260,7 @@ void FramelessWidgetsHelper::paintEventHandler(QPaintEvent *event) painter.restore(); } -void FramelessWidgetsHelper::mousePressEventHandler(QMouseEvent *event) +void FramelessWidgetsHelper::mouseMoveEventHandler(QMouseEvent *event) { Q_ASSERT(event); if (!event) { @@ -269,9 +269,6 @@ void FramelessWidgetsHelper::mousePressEventHandler(QMouseEvent *event) if (m_settings.options & Option::DisableDragging) { return; } - if (event->button() != Qt::LeftButton) { - return; - } #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) const QPoint scenePos = event->scenePosition().toPoint(); #else @@ -739,9 +736,9 @@ bool FramelessWidgetsHelper::eventFilter(QObject *object, QEvent *event) const auto paintEvent = static_cast(event); paintEventHandler(paintEvent); } break; - case QEvent::MouseButtonPress: { + case QEvent::MouseMove: { const auto mouseEvent = static_cast(event); - mousePressEventHandler(mouseEvent); + mouseMoveEventHandler(mouseEvent); } break; case QEvent::MouseButtonRelease: { const auto mouseEvent = static_cast(event);