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

Support for changed callback in global

Browse source 
Fixes #6599

ChangeLog: Support property changed callbacks in globals
This commit is contained in:
Olivier Goffart 2024-10-21 17:06:37 +02:00
parent 25607a9706
commit ff53791ce7
8 changed files with 114 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2534,6 +2534,22 @@ fn generate_global(
}
}
for (i, _) in global.change_callbacks.iter() {
global_struct.members.push((
Access::Private,
Declaration::Var(Var {
ty: "slint::private_api::ChangeTracker".into(),
name: format_smolstr!("change_tracker{}", i),
..Default::default()
}),
));
}
init.extend(global.change_callbacks.iter().map(|(p, e)| {
let code = compile_expression(&e.borrow(), &ctx);
let prop = access_member(&llr::PropertyReference::Local { sub_component_path: vec![], property_index: *p }, &ctx);
format!("this->change_tracker{p}.init(this, [this]([[maybe_unused]] auto self) {{ return {prop}.get(); }}, [this]([[maybe_unused]] auto self, auto) {{ {code}; }});")
}));
global_struct.members.push((
Access::Public,
Declaration::Function(Function {

34
internal/compiler/generator/rust.rs
View file

@ -1357,6 +1357,37 @@ fn generate_global(global: &llr::GlobalComponent, root: &llr::CompilationUnit) -
}
}
let public_component_id = ident(&global.name);
let global_id = format_ident!("global_{}", public_component_id);
let change_tracker_names =
global.change_callbacks.iter().map(|(idx, _)| format_ident!("change_tracker{idx}"));
init.extend(global.change_callbacks.iter().map(|(p, e)| {
let code = compile_expression(&e.borrow(), &ctx);
let prop = access_member(
&llr::PropertyReference::Local { sub_component_path: vec![], property_index: *p },
&ctx,
)
.unwrap();
let change_tracker = format_ident!("change_tracker{p}");
quote! {
#[allow(dead_code, unused)]
_self.#change_tracker.init(
self_rc.globals.get().unwrap().clone(),
move |global_weak| {
let self_rc = global_weak.upgrade().unwrap().#global_id.clone();
let _self = self_rc.as_ref();
#prop.get()
},
move |global_weak, _| {
let self_rc = global_weak.upgrade().unwrap().#global_id.clone();
let _self = self_rc.as_ref();
#code;
}
);
}
}));
let public_interface = global.exported.then(|| {
let property_and_callback_accessors = public_api(
&global.public_properties,
@ -1364,8 +1395,6 @@ fn generate_global(global: &llr::GlobalComponent, root: &llr::CompilationUnit) -
quote!(self.0.as_ref()),
&ctx,
);
let public_component_id = ident(&global.name);
let global_id = format_ident!("global_{}", public_component_id);
let aliases = global.aliases.iter().map(|name| ident(name));
let getters = root.public_components.iter().map(|c| {
let root_component_id = ident(&c.name);
@ -1398,6 +1427,7 @@ fn generate_global(global: &llr::GlobalComponent, root: &llr::CompilationUnit) -
struct #inner_component_id {
#(#declared_property_vars: sp::Property<#declared_property_types>,)*
#(#declared_callbacks: sp::Callback<(#(#declared_callbacks_types,)*), #declared_callbacks_ret>,)*
#(#change_tracker_names : sp::ChangeTracker,)*
globals : sp::OnceCell<sp::Weak<SharedGlobals>>,
}