diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-12-12 16:25:40 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-13 13:38:37 +0000 |
| commit | bc6414762e48f12f6680ee6bb667c49c64fbd32a (patch) | |
| tree | 54e777076df88f2e2ed131bdc97dfe1a8c8c446f /src/imports/controls/material | |
| parent | 3340d712bc7eedee5e396278b6bbe15c71d0d773 (diff) | |
Material: prevent ripples from getting stuck in disabled state
Ripples don't trigger when the ripple item itself is disabled. This is
used in SwipeDelegate to prevent ripples when a swipe is open. Now that
swipe.position is transitioned, a release event comes before the swipe
position reaches 0, so we must ensure that the wave exits even if it's
not yet enabled.
Change-Id: Ib4d58ff974262331898db2133e06624eb890f9ed
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialripple.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/controls/material/qquickmaterialripple.cpp b/src/imports/controls/material/qquickmaterialripple.cpp index 837dd760..f4dca135 100644 --- a/src/imports/controls/material/qquickmaterialripple.cpp +++ b/src/imports/controls/material/qquickmaterialripple.cpp @@ -288,8 +288,10 @@ void QQuickMaterialRipple::setPressed(bool pressed) m_pressed = pressed; - if (!isEnabled()) + if (!isEnabled()) { + exitWave(); return; + } if (pressed) { if (m_trigger == Press) |