language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 10:50:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

LLR: merge the popup's x and y property access in one expression

Browse source
This commit is contained in:
Olivier Goffart 2024-07-10 15:26:46 +02:00
parent 821d8a893c
commit e67e46ab47
7 changed files with 23 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/compiler/generator/cpp.rs
View file

@ -3323,20 +3323,16 @@ fn compile_builtin_function_call(
let popup_window_id =
ident(&popup.item_tree.root.name);
let parent_component = access_item_rc(parent_ref, ctx);
let popup_ctx = EvaluationContext::new_sub_component(
ctx.compilation_unit,
&popup.item_tree.root,
CppGeneratorContext { global_access: "self->globals".into(), conditional_includes: ctx.generator_state.conditional_includes },
Some(ParentCtx::new(&ctx, None)),
);
let x = access_member(&popup.x_prop, &popup_ctx);
let y = access_member(&popup.y_prop, &popup_ctx);
let position = compile_expression(&popup.position.borrow(), &popup_ctx);
let close_on_click = compile_expression(close_on_click, ctx);
format!(
"{window}.show_popup<{popup_window_id}>({component_access}, [=](auto self) {{ return {x}.get(); }}, [=](auto self) {{ return {y}.get(); }}, {close_on_click}, {{ {parent_component} }})"
"{window}.show_popup<{popup_window_id}>({component_access}, [=](auto self) {{ return {position}; }}, {close_on_click}, {{ {parent_component} }})"
)
} else {
panic!("internal error: invalid args to ShowPopupWindow {:?}", arguments)