language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-02 22:54:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

C++: Fix input event within repeater

Browse source
This commit is contained in:
Olivier Goffart 2020-08-10 08:55:42 +02:00
parent 9b0dfa14b5
commit cc5d5cc92b
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sixtyfps_compiler/generator/cpp.rs
View file

@ -357,6 +357,7 @@ fn handle_repeater(
component_struct: &mut Struct,
init: &mut Vec<String>,
children_repeater_cases: &mut Vec<String>,
repeated_input_branch: &mut Vec<String>,
) {
let repeater_id =
format!("repeater_{}", base_component.parent_element.upgrade().unwrap().borrow().id);
@ -407,6 +408,12 @@ fn handle_repeater(
));
}
repeated_input_branch.push(format!(
"\n case {i}: return self->{id}.item_at(rep_index);",
i = repeater_count,
id = repeater_id,
));
component_struct.members.push((
Access::Private,
Declaration::Var(Var {
@ -661,6 +668,7 @@ fn generate_component(
}
let mut children_visitor_case = vec![];
let mut repeated_input_branch = vec![];
let mut tree_array = vec![];
let mut repeater_count = 0;
super::build_array_helper(component, |item_rc, children_offset, is_flickable_rect| {
@ -692,6 +700,7 @@ fn generate_component(
&mut component_struct,
&mut init,
&mut children_visitor_case,
&mut repeated_input_branch,
);
repeater_count += 1;
} else {
@ -770,7 +779,9 @@ fn generate_component(
is_static: true,
statements: Some(vec![
format!(" auto self = reinterpret_cast<{}*>(component.instance);", component_id),
"return sixtyfps::process_input_event(component, self->mouse_grabber, mouse_event, item_tree(), [](auto...) { return sixtyfps::InputEventResult::EventIgnored; });".into()
"return sixtyfps::process_input_event(component, self->mouse_grabber, mouse_event, item_tree(), [self](int dyn_index, [[maybe_unused]] int rep_index) {".into(),
format!(" switch(dyn_index) {{ {} }};", repeated_input_branch.join("")),
" return sixtyfps::ComponentRef{nullptr, nullptr};\n});".into(),
]),
..Default::default()
}),