language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-12-23 09:19:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Rename for consistency repeater_indexes => repeater_indices

Browse source
This commit is contained in:
David Faure 2025-12-09 22:15:28 +01:00 • committed by Olivier Goffart
parent 56d35ab144
commit 2c4028b3d2
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/cpp/include/slint.h
View file

@ -114,11 +114,11 @@ inline static void register_item_tree(const vtable::VRc<ItemTreeVTable> *c,
}
inline SharedVector<float> solve_box_layout(const cbindgen_private::BoxLayoutData &data,
cbindgen_private::Slice<int> repeater_indexes)
cbindgen_private::Slice<int> repeater_indices)
{
SharedVector<float> result;
cbindgen_private::Slice<uint32_t> ri =
make_slice(reinterpret_cast<uint32_t *>(repeater_indexes.ptr), repeater_indexes.len);
make_slice(reinterpret_cast<uint32_t *>(repeater_indices.ptr), repeater_indices.len);
cbindgen_private::slint_solve_box_layout(&data, ri, &result);
return result;
}

16
internal/core/layout.rs
View file

@ -675,9 +675,9 @@ pub struct BoxLayoutCellData {
}
/// Solve a BoxLayout
pub fn solve_box_layout(data: &BoxLayoutData, repeater_indexes: Slice<u32>) -> SharedVector<Coord> {
pub fn solve_box_layout(data: &BoxLayoutData, repeater_indices: Slice<u32>) -> SharedVector<Coord> {
let mut result = SharedVector::<Coord>::default();
result.resize(data.cells.len() * 2 + repeater_indexes.len(), 0 as _);
result.resize(data.cells.len() * 2 + repeater_indices.len(), 0 as _);
if data.cells.is_empty() {
return result;
@ -755,14 +755,14 @@ pub fn solve_box_layout(data: &BoxLayoutData, repeater_indexes: Slice<u32>) -> S
// The index/2 in result in which we should add the next repeated item
let mut repeat_offset =
res.len() / 2 - repeater_indexes.iter().skip(1).step_by(2).sum::<u32>() as usize;
// The index/2 in repeater_indexes
res.len() / 2 - repeater_indices.iter().skip(1).step_by(2).sum::<u32>() as usize;
// The index/2 in repeater_indices
let mut next_rep = 0;
// The index/2 in result in which we should add the next non-repeated item
let mut current_offset = 0;
for (idx, layout) in layout_data.iter().enumerate() {
let o = loop {
if let Some(nr) = repeater_indexes.get(next_rep * 2) {
if let Some(nr) = repeater_indices.get(next_rep * 2) {
let nr = *nr as usize;
if nr == idx {
for o in 0..2 {
@ -771,7 +771,7 @@ pub fn solve_box_layout(data: &BoxLayoutData, repeater_indexes: Slice<u32>) -> S
current_offset += 1;
}
if idx >= nr {
if idx - nr == repeater_indexes[next_rep * 2 + 1] as usize {
if idx - nr == repeater_indices[next_rep * 2 + 1] as usize {
next_rep += 1;
continue;
}
@ -879,10 +879,10 @@ pub(crate) mod ffi {
#[unsafe(no_mangle)]
pub extern "C" fn slint_solve_box_layout(
data: &BoxLayoutData,
repeater_indexes: Slice<u32>,
repeater_indices: Slice<u32>,
result: &mut SharedVector<Coord>,
) {
*result = super::solve_box_layout(data, repeater_indexes)
*result = super::solve_box_layout(data, repeater_indices)
}
#[unsafe(no_mangle)]