diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-11 05:54:49 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-11 05:54:49 (GMT) |
commit | f7982be51ec5872dba11d87ea653b791251a0215 (patch) | |
tree | 556dad915f8ffba2c388dba2750e48d52962f71f /src/declarative/util/qmllistmodel.cpp | |
parent | efc7963a15c204db48cb3b6560366410b640e5c3 (diff) | |
parent | e4648700e7e3c84c61d6b012f7d480394b889c31 (diff) | |
download | Qt-f7982be51ec5872dba11d87ea653b791251a0215.zip Qt-f7982be51ec5872dba11d87ea653b791251a0215.tar.gz Qt-f7982be51ec5872dba11d87ea653b791251a0215.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmllistmodel.cpp')
-rw-r--r-- | src/declarative/util/qmllistmodel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp index 345bc3b..69bed25 100644 --- a/src/declarative/util/qmllistmodel.cpp +++ b/src/declarative/util/qmllistmodel.cpp @@ -499,6 +499,9 @@ void QmlListModel::move(int from, int to, int n) { if (from+n > count() || to+n > count() || n==0 || from==to || from < 0 || to < 0) return; + int origfrom=from; // preserve actual move, so any animations are correct + int origto=to; + int orign=n; if (from > to) { // Only move forwards - flip if backwards moving int tfrom = from; @@ -524,7 +527,7 @@ void QmlListModel::move(int from, int to, int n) for (; f != replaced.end(); ++f, ++t) *t = *f; } - emit itemsMoved(from,to,n); + emit itemsMoved(origfrom,origto,orign); } /*! |