Fix computation of the item sub range

We need to account for the repeater count in the item sub-range (cherry picked from commit e04835d)
slint-ui · Sep 15, 2023 · ff0bb80 · ff0bb80
1 parent 1e74d8b
commit ff0bb80
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/internal/compiler/generator/cpp.rs b/internal/compiler/generator/cpp.rs
@@ -1824,6 +1824,7 @@ fn generate_sub_component(
                     "}} else if (index >= {} && index < {}) {{",
                     sub.index_of_first_child_in_tree,
                     sub.index_of_first_child_in_tree + sub_items_count - 1
+                        + sub.ty.repeater_count()
                 ));
                 code.push(format!(
                     "    return self->{}.{name}(index - {}{forward_args});",

diff --git a/internal/compiler/generator/rust.rs b/internal/compiler/generator/rust.rs
@@ -872,7 +872,7 @@ fn generate_sub_component(
         ));
         if sub_items_count > 1 {
             let range_begin = local_index_of_first_child as usize;
-            let range_end = range_begin + sub_items_count - 2;
+            let range_end = range_begin + sub_items_count - 2 + sub.ty.repeater_count();
             accessible_role_branch.push(quote!(
                 #range_begin..=#range_end => #sub_compo_field.apply_pin(_self).accessible_role(index - #range_begin + 1),
             ));