Fix clipping and border-radius

Fix #4854
slint-ui · Mar 14, 2024 · 5c381fd · 5c381fd
1 parent 78771e0
commit 5c381fd
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/internal/compiler/builtins.slint b/internal/compiler/builtins.slint
@@ -209,7 +209,6 @@ export component TextInput {
 }
 
 export component Clip {
-    in property <length> border-radius;
     in property <length> border-top-left-radius;
     in property <length> border-top-right-radius;
     in property <length> border-bottom-left-radius;

diff --git a/internal/compiler/passes/border_radius.rs b/internal/compiler/passes/border_radius.rs
@@ -8,7 +8,7 @@ use crate::expression_tree::{Expression, NamedReference};
 use crate::object_tree::Component;
 use std::rc::Rc;
 
-const BORDER_RADIUS_PROPERTIES: [&str; 4] = [
+pub const BORDER_RADIUS_PROPERTIES: [&str; 4] = [
     "border-top-left-radius",
     "border-top-right-radius",
     "border-bottom-right-radius",

diff --git a/internal/compiler/passes/clip.rs b/internal/compiler/passes/clip.rs
@@ -79,23 +79,23 @@ fn create_clip_element(parent_elem: &ElementRc, native_clip: &Rc<NativeClass>) {
             )
         })
         .collect();
-    for optional_binding in [
-        "border-radius",
-        "border-top-left-radius",
-        "border-top-right-radius",
-        "border-bottom-right-radius",
-        "border-bottom-left-radius",
-        "border-width",
-    ]
-    .iter()
+
+    copy_optional_binding(parent_elem, "border-width", &clip);
+    if super::border_radius::BORDER_RADIUS_PROPERTIES
+        .iter()
+        .any(|property_name| parent_elem.borrow().is_binding_set(property_name, true))
     {
-        if parent_elem.borrow().bindings.contains_key(*optional_binding) {
+        for optional_binding in super::border_radius::BORDER_RADIUS_PROPERTIES.iter() {
+            copy_optional_binding(parent_elem, optional_binding, &clip);
+        }
+    } else if parent_elem.borrow().bindings.contains_key("border-radius") {
+        for prop in super::border_radius::BORDER_RADIUS_PROPERTIES.iter() {
             clip.borrow_mut().bindings.insert(
-                optional_binding.to_string(),
+                prop.to_string(),
                 RefCell::new(
                     Expression::PropertyReference(NamedReference::new(
                         parent_elem,
-                        optional_binding,
+                        "border-radius",
                     ))
                     .into(),
                 ),
@@ -107,3 +107,15 @@ fn create_clip_element(parent_elem: &ElementRc, native_clip: &Rc<NativeClass>) {
         BindingExpression::new_two_way(NamedReference::new(parent_elem, "clip")).into(),
     );
 }
+
+fn copy_optional_binding(parent_elem: &ElementRc, optional_binding: &str, clip: &ElementRc) {
+    if parent_elem.borrow().bindings.contains_key(optional_binding) {
+        clip.borrow_mut().bindings.insert(
+            optional_binding.to_string(),
+            RefCell::new(
+                Expression::PropertyReference(NamedReference::new(parent_elem, optional_binding))
+                    .into(),
+            ),
+        );
+    }
+}
diff --git a/internal/core/items.rs b/internal/core/items.rs
@@ -854,7 +854,6 @@ declare_item_vtable! {
 #[pin]
 /// The implementation of the `Clip` element
 pub struct Clip {
-    pub border_radius: Property<LogicalLength>,
     pub border_top_left_radius: Property<LogicalLength>,
     pub border_top_right_radius: Property<LogicalLength>,
     pub border_bottom_left_radius: Property<LogicalLength>,