Route master-merged bindings accesses through the sealed accessor

Author: LeonMatthes

internal/compiler/generator/slint_sc.rs

@@ -110,8 +110,7 @@ fn declared_properties(root: &ElementRc) -> Vec<DeclaredProperty> {
         .filter(|(_, decl)| decl.node.is_some())
         .map(|(name, decl)| {
             let init = root_borrowed
-                .bindings
-                .get(name)
+                .binding_cell_including_synthetic(name)
                 .map(|b| compile_expression(&b.borrow().expression, root))
                 .unwrap_or_else(|| default_value(&decl.property_type));
             let snake = name.replace('-', "_");
@@ -202,8 +201,10 @@ fn emit_element(elem: &ElementRc, root: &ElementRc) -> TokenStream {
     let h = resolve(geometry.as_ref().map(|g| &g.height)).expect("element without a height");
     let x = resolve(geometry.as_ref().map(|g| &g.x)).unwrap_or_else(|| quote!(0i32));
     let y = resolve(geometry.as_ref().map(|g| &g.y)).unwrap_or_else(|| quote!(0i32));
-    let background =
-        elem.borrow().bindings.get("background").map(|b| b.borrow().expression.clone());
+    let background = elem
+        .borrow()
+        .binding_cell_including_synthetic("background")
+        .map(|b| b.borrow().expression.clone());
     let mut color = background.map(|expr| compile_expression(&expr, root));
     if std::rc::Rc::ptr_eq(elem, root) {
         // The window background defaults to black, so that the whole frame
@@ -237,7 +238,10 @@ fn emit_element(elem: &ElementRc, root: &ElementRc) -> TokenStream {
 /// size for the root's unbound width and height.
 fn compile_property_reference(nr: &NamedReference, root: &ElementRc) -> Option<TokenStream> {
     let element = nr.element();
-    let binding = element.borrow().bindings.get(nr.name()).map(|b| b.borrow().expression.clone());
+    let binding = element
+        .borrow()
+        .binding_cell_including_synthetic(nr.name())
+        .map(|b| b.borrow().expression.clone());
     match binding {
         Some(expr) => Some(compile_expression(&expr, root)),
         None if std::rc::Rc::ptr_eq(&element, root) => match nr.name().as_str() {

internal/compiler/object_tree.rs

@@ -542,7 +542,7 @@ impl Component {
             .is_some_and(|b| matches!(b.name.as_str(), "Window" | "Dialog"))
         {
             for prop in ["x", "y"] {
-                if let Some(b) = c.root_element.borrow().bindings.get(prop) {
+                if let Some(b) = c.root_element.borrow().binding_cell_including_synthetic(prop) {
                     #[cfg(feature = "slint-sc")]
                     if diag.slint_sc {
                         diag.slint_sc_error(&format!("The property '{prop}' is"), &*b.borrow());
@@ -2199,8 +2199,7 @@ impl Element {
             // Check if content-width and content-height are explicitly set by the user,
             // either under their own name or through the deprecated viewport-* aliases.
             let (content_width_is_explicitly_set, content_height_is_explicitly_set) = {
-                let has_binding =
-                    |name| parent_elem.binding(name).is_some_and(|b| b.has_binding());
+                let has_binding = |name| parent_elem.binding(name).is_some_and(|b| b.has_binding());
                 (
                     has_binding("content-width") || has_binding("viewport-width"),
                     has_binding("content-height") || has_binding("viewport-height"),