diff options
Diffstat (limited to 'src/templates')
-rw-r--r-- | src/templates/qquickabstractbutton.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/templates/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp index 6aa44cad..95afc09d 100644 --- a/src/templates/qquickabstractbutton.cpp +++ b/src/templates/qquickabstractbutton.cpp @@ -122,6 +122,7 @@ void QQuickAbstractButtonPrivate::startPressAndHold() { Q_Q(QQuickAbstractButton); wasHeld = false; + stopPressAndHold(); if (isPressAndHoldConnected()) holdTimer = q->startTimer(QGuiApplication::styleHints()->mousePressAndHoldInterval()); } @@ -515,8 +516,10 @@ void QQuickAbstractButton::mousePressEvent(QMouseEvent *event) if (d->autoRepeat) { d->startRepeatDelay(); d->repeatButton = event->button(); - } else { + } else if (Qt::LeftButton == (event->buttons() & Qt::LeftButton)) { d->startPressAndHold(); + } else { + d->stopPressAndHold(); } } @@ -528,7 +531,7 @@ void QQuickAbstractButton::mouseMoveEvent(QMouseEvent *event) if (d->autoRepeat) d->stopPressRepeat(); - else if (!d->pressed) + else if (d->holdTimer > 0 && QLineF(d->pressPoint, event->localPos()).length() > QGuiApplication::styleHints()->startDragDistance()) d->stopPressAndHold(); } |