pogmommy/eww
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for loop widget not removing scopes when value changes

Browse source
This commit is contained in:
elkowar 2022-10-01 17:37:32 +02:00
parent f0d4f40dcf
commit 0cccd9d74f
No known key found for this signature in database
GPG key ID: E321AD71B1D1F27F
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/eww/src/widgets/build_widget.rs
View file

@ -235,6 +235,7 @@ fn build_loop_special_widget(
let element_name = widget_use.element_name.clone(); let element_name = widget_use.element_name.clone();
let body: WidgetUse = widget_use.body.as_ref().clone(); let body: WidgetUse = widget_use.body.as_ref().clone();
let created_children = Rc::new(RefCell::new(Vec::<gtk::Widget>::new())); let created_children = Rc::new(RefCell::new(Vec::<gtk::Widget>::new()));
let created_child_scopes = Rc::new(RefCell::new(Vec::<ScopeIndex>::new()));
let gtk_container = gtk_container.clone(); let gtk_container = gtk_container.clone();
move |tree, values| { move |tree, values| {
let elements_value = elements_expr let elements_value = elements_expr
@ -249,6 +250,11 @@ fn build_loop_special_widget(
for old_child in created_children.drain(..) { for old_child in created_children.drain(..) {
unsafe { old_child.destroy() }; unsafe { old_child.destroy() };
} }
let mut created_child_scopes = created_child_scopes.borrow_mut();
for child_scope in created_child_scopes.drain(..) {
tree.remove_scope(child_scope);
}
for element in elements_value { for element in elements_value {
let scope = tree.register_new_scope( let scope = tree.register_new_scope(
format!("for {} = {}", element_name.0, element), format!("for {} = {}", element_name.0, element),
@ -258,6 +264,7 @@ fn build_loop_special_widget(
element_name.clone().into() => SimplExpr::Literal(DynVal(element.0, elements_expr_span)) element_name.clone().into() => SimplExpr::Literal(DynVal(element.0, elements_expr_span))
}, },
)?; )?;
created_child_scopes.push(scope);
let new_child_widget = let new_child_widget =
build_gtk_widget(tree, widget_defs.clone(), scope, body.clone(), custom_widget_invocation.clone())?; build_gtk_widget(tree, widget_defs.clone(), scope, body.clone(), custom_widget_invocation.clone())?;
gtk_container.add(&new_child_widget); gtk_container.add(&new_child_widget);