aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-01-14 14:19:26 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-01-14 17:20:43 +0000
commit536cdf48327eefc831b84b314b7088055576d211 (patch)
tree09830d13f4500935574ecfc4228280766f9ae10e /src
parent3ff601134de497bd624bc27f454b92b326c7cf27 (diff)
Fix initial currentIndex in Tumbler when wrap is set to false
syncCurrentIndex () function assumes that PathView is used as view for, Tumbler component, and states that actualViewIndex should be 0 while initialization. This statement is not correct when Tumbler is in non-wrap mode and uses ListView as view, where currentIndex is set to -1 by default. Fix actualViewIndex condition according to ListView logic. Fixes: QTBUG-84426 Change-Id: I4ef1e7b45399bf748968490f44b8909f3218d9bc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 1fe83c1fd3eb9abfd13a7b8c7adb2c2355d8ad4d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/quicktemplates2/qquicktumbler.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp
index c1d1c00f..35ed9680 100644
--- a/src/quicktemplates2/qquicktumbler.cpp
+++ b/src/quicktemplates2/qquicktumbler.cpp
@@ -662,8 +662,9 @@ void QQuickTumblerPrivate::syncCurrentIndex()
return;
}
- // PathView likes to use 0 as currentIndex for empty models, but we use -1 for that.
- if (q->count() == 0 && actualViewIndex == 0)
+ // actualViewIndex might be 0 or -1 for PathView and ListView respectively,
+ // but we always use -1 for that.
+ if (q->count() == 0 && actualViewIndex <= 0)
return;
ignoreCurrentIndexChanges = true;