diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-08-28 06:56:05 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-08-28 06:56:05 (GMT) |
| commit | c61b59a7d856b9c7783c87d2cccfc2ed913ef543 (patch) | |
| tree | 43a1787aae620317f41afabb3eb2257b60ac564f /src/declarative | |
| parent | ab643ba4d2193352302d237ae36e1246b5399176 (diff) | |
| download | Qt-c61b59a7d856b9c7783c87d2cccfc2ed913ef543.zip Qt-c61b59a7d856b9c7783c87d2cccfc2ed913ef543.tar.gz Qt-c61b59a7d856b9c7783c87d2cccfc2ed913ef543.tar.bz2 | |
Fix combined horizontal and vertical flicking
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/fx/qfxflickable.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp index 07df799..27bfa27 100644 --- a/src/declarative/fx/qfxflickable.cpp +++ b/src/declarative/fx/qfxflickable.cpp @@ -142,7 +142,7 @@ void QFxFlickablePrivate::flickX(qreal velocity) else v = maxVelocity; } - _tl.clear(); + _tl.reset(_moveX); _tl.accel(_moveX, v, 500, maxDistance); _tl.execute(fixupXEvent); if (!flicked) { @@ -151,7 +151,7 @@ void QFxFlickablePrivate::flickX(qreal velocity) emit q->flickStarted(); } } else { - _tl.clear(); + _tl.reset(_moveX); fixupX(); } } @@ -178,7 +178,7 @@ void QFxFlickablePrivate::flickY(qreal velocity) else v = maxVelocity; } - _tl.clear(); + _tl.reset(_moveY); _tl.accel(_moveY, v, 500, maxDistance); _tl.execute(fixupYEvent); if (!flicked) { @@ -187,7 +187,7 @@ void QFxFlickablePrivate::flickY(qreal velocity) emit q->flickStarted(); } } else { - _tl.clear(); + _tl.reset(_moveY); fixupY(); } } |