summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-10-28 04:50:54 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-10-28 04:50:54 (GMT)
commitda87fe823c6e249de20ea6a38482b387dcfbbef7 (patch)
tree07ff0ca420c493edf8a9136012aadec0dfdab991 /src/declarative/fx
parentc394f166af47fed34652685531ca1811c7f7568b (diff)
downloadQt-da87fe823c6e249de20ea6a38482b387dcfbbef7.zip
Qt-da87fe823c6e249de20ea6a38482b387dcfbbef7.tar.gz
Qt-da87fe823c6e249de20ea6a38482b387dcfbbef7.tar.bz2
Cancel flicking on increment/decrementIndex also.
Diffstat (limited to 'src/declarative/fx')
-rw-r--r--src/declarative/fx/qfxlistview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp
index 49c2d11..15680e1 100644
--- a/src/declarative/fx/qfxlistview.cpp
+++ b/src/declarative/fx/qfxlistview.cpp
@@ -1628,6 +1628,7 @@ void QFxListView::incrementCurrentIndex()
Q_D(QFxListView);
if (currentIndex() < d->model->count() - 1 || d->wrap) {
int index = currentIndex()+1;
+ cancelFlick();
d->updateCurrent(index < d->model->count() ? index : 0);
}
}
@@ -1643,6 +1644,7 @@ void QFxListView::decrementCurrentIndex()
Q_D(QFxListView);
if (currentIndex() > 0 || d->wrap) {
int index = currentIndex()-1;
+ cancelFlick();
d->updateCurrent(index >= 0 ? index : d->model->count()-1);
}
}