diff options
| author | Martin Jones <martin.jones@qinetic.com.au> | 2016-09-16 17:32:58 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@qinetic.com.au> | 2016-09-22 22:24:28 +0000 |
| commit | e05fbf5c8bf636db5c500c3371d673de17de8c33 (patch) | |
| tree | eb2acd660ed3547662948f79c5c334b5ea0930e4 /src | |
| parent | ad48b299b7fe0bbed2749adc66725e4f12661f79 (diff) | |
Fix MouseArea sticky grab with drag.filterChildren enabled
Task-number: QTBUG-56036
Change-Id: Iad776f42cc776e0d397173b3d2f3922eb7914392
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquickmousearea.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp index d66e55aa12..a8a889d47b 100644 --- a/src/quick/items/qquickmousearea.cpp +++ b/src/quick/items/qquickmousearea.cpp @@ -666,6 +666,7 @@ void QQuickMouseArea::mousePressEvent(QMouseEvent *event) Q_D(QQuickMouseArea); d->moved = false; d->stealMouse = d->preventStealing; + d->overThreshold = false; if (!d->enabled || !(event->button() & acceptedMouseButtons())) { QQuickItem::mousePressEvent(event); } else { @@ -944,6 +945,7 @@ bool QQuickMouseArea::sendMouseEvent(QMouseEvent *event) if (!d->pressed) { // no other buttons are pressed d->stealMouse = false; + d->overThreshold = false; if (c && c->mouseGrabberItem() == this) ungrabMouse(); emit canceled(); |