diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-04-11 21:44:47 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-04-12 09:07:57 +0000 |
| commit | 571f4be253386cb30a55060bed7d81ef356124eb (patch) | |
| tree | 4b1b3638ad3886ad7c92d38c1a03d62e31435cc3 /src | |
| parent | 8615db11a61178c5be5c2ef9e373ad0d245888d6 (diff) | |
QQuickAbstractButton: fix the order of nextCheckState() vs. clicked()
Task-number: QTBUG-52448
Change-Id: I4ee2c16f3dccc61e07268f9e8ced530a06d2adf3
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/templates/qquickabstractbutton.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/templates/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp index 44fa30b1..071b4964 100644 --- a/src/templates/qquickabstractbutton.cpp +++ b/src/templates/qquickabstractbutton.cpp @@ -478,9 +478,9 @@ void QQuickAbstractButton::keyReleaseEvent(QKeyEvent *event) if (event->key() == Qt::Key_Space) { setPressed(false); + nextCheckState(); emit released(); emit clicked(); - nextCheckState(); if (d->autoRepeat) d->stopPressRepeat(); @@ -525,6 +525,9 @@ void QQuickAbstractButton::mouseReleaseEvent(QMouseEvent *event) bool wasPressed = d->pressed; setPressed(false); + if (contains(event->pos())) + nextCheckState(); + if (wasPressed) { emit released(); if (!d->wasHeld) @@ -533,9 +536,6 @@ void QQuickAbstractButton::mouseReleaseEvent(QMouseEvent *event) emit canceled(); } - if (contains(event->pos())) - nextCheckState(); - if (d->autoRepeat) d->stopPressRepeat(); else |