Val calc support

_release-content/migration-guides/val_refactor.md

@@ -0,0 +1,11 @@
+---
+title: "Val refactor"
+pull_requests: [26409]
+---
+
+- `LayoutContext` has been renamed to `ValContext`.
+- `Val::resolve`, `Val2::resolve`, `UiPosition::resolve`, `CornerRadius::resolve`,
+  `RadialGradientShape::resolve`, `BorderRadius::resolve`, and `UiTransform::compute_affine`
+  now take `&ValContext` instead of separate scale factor, target size, `EmSize`, and `RemSize`
+  arguments. The basis for percent values remains a separate argument.
+- `Val` has been moved from the `bevy_ui` crate's `geometry` module to a new module `val`.

_release-content/release-notes/val_calc.md

@@ -0,0 +1,5 @@
+---
+title: "Val calc"
+authors: ["@ickshonope"]
+pull_requests: [26409]
+---

benches/benches/bevy_ui/layout.rs

@@ -231,7 +231,7 @@ fn layout(c: &mut Criterion) {
                 for &leaf in &leaves {
                     let mut node = app.world_mut().get_mut::<Node>(leaf).unwrap();
                     let length = if node.width == px(1) { px(2) } else { px(1) };
-                    node.width = length;
+                    node.width = length.clone();
                     node.height = length;
                 }
                 app.update();
@@ -254,7 +254,7 @@ fn layout(c: &mut Criterion) {
                 b.iter(|| {
                     let mut node = app.world_mut().get_mut::<Node>(leaf).unwrap();
                     let length = if node.width == px(1) { px(2) } else { px(1) };
-                    node.width = length;
+                    node.width = length.clone();
                     node.height = length;
                     app.update();
                 });

crates/bevy_dev_tools/src/diagnostics_overlay.rs

@@ -24,7 +24,7 @@ const BACKGROUND_COLOR_ALPHA: f32 = 0.75;
 /// Row and column gap for the diagnostics overlay
 const ROW_COLUMN_GAP: Val = Val::Px(4.);
 /// Padding for cels of the diagnostics overlay
-const DEFAULT_PADDING: UiRect = UiRect::all(Val::Px(4.));
+const DEFAULT_PADDING: UiRect = UiRect::px(4., 4., 4., 4.);
 /// Initial Z-index for the [`DiagnosticsOverlayPlane`]
 pub const INITIAL_DIAGNOSTICS_OVERLAY_PLANE_Z_INDEX: GlobalZIndex = GlobalZIndex(1_000_000);
 /// Alias to shorten the name

crates/bevy_feathers/src/controls/color_plane.rs

@@ -253,7 +253,7 @@ fn update_plane_thumb_position(
         };
         let inner_size = inner_node.size() * inner_node.inverse_scale_factor;
         if inner_size.x > 0.0 && inner_size.y > 0.0 {
-            let mut updated_transform = *thumb_transform;
+            let mut updated_transform = thumb_transform.clone();
             // `ColorPlaneValue` is in channel space, where y increases upward, while
             // the transform is in screen space (+y down), so the y component is inverted.
             updated_transform.translation = Val2::new(

crates/bevy_feathers/src/controls/color_slider.rs

@@ -338,7 +338,7 @@ fn update_slider_pos(
             {
                 let track_width = track_node.size().x * track_node.inverse_scale_factor;
                 let thumb_offset = range.thumb_position(value.0) * track_width - THUMB_SIZE * 0.5;
-                let mut updated_transform = *thumb_transform;
+                let mut updated_transform = thumb_transform.clone();
                 updated_transform.translation.x = px(thumb_offset);
                 thumb_transform.set_if_neq(updated_transform);
             }

crates/bevy_feathers/src/controls/color_wheel.rs

@@ -340,7 +340,7 @@ fn position_thumb(q_transform: &mut Query<&mut UiTransform>, thumb_ent: Entity,
     let Ok(mut thumb_transform) = q_transform.get_mut(thumb_ent) else {
         return;
     };
-    let mut updated_transform = *thumb_transform;
+    let mut updated_transform = thumb_transform.clone();
     updated_transform.translation =
         Val2::px(position.x - THUMB_SIZE * 0.5, position.y - THUMB_SIZE * 0.5);
     thumb_transform.set_if_neq(updated_transform);

crates/bevy_feathers/src/controls/scrollbar.rs

@@ -143,7 +143,11 @@ fn update_scrollbar_visibility(
         if let Ok(child_of) = q_parents.get(scrollbar_ent)
             && let Ok((gutter, mut node)) = q_gutters.get_mut(child_of.parent())
         {
-            let padding = if overflows { gutter.0 } else { Val::ZERO };
+            let padding = if overflows {
+                gutter.0.clone()
+            } else {
+                Val::ZERO
+            };
             match scrollbar.orientation {
                 ControlOrientation::Vertical => {
                     if node.padding.right != padding {

crates/bevy_feathers/src/controls/tabs.rs

@@ -526,12 +526,12 @@ fn arrange_tab_lists(
             if let Ok(mut node) = start.get_mut(child)
                 && node.margin != start_margin
             {
-                node.margin = start_margin;
+                node.margin = start_margin.clone();
             }
             if let Ok(mut node) = end.get_mut(child)
                 && node.margin != end_margin
             {
-                node.margin = end_margin;
+                node.margin = end_margin.clone();
             }
         }
         let rank = |child: &Entity| {
@@ -684,8 +684,8 @@ fn fillet_node(visible: bool, edge: PhysicalEdge) -> Node {
             true => Display::Flex,
             false => Display::None,
         },
-        width: size,
-        height: size,
+        width: size.clone(),
+        height: size.clone(),
         ..Default::default()
     };
     match edge {
@@ -942,8 +942,8 @@ fn spawn_tab_drag_proxy(
             align_items: AlignItems::Center,
             padding: UiRect::horizontal(px(TAB_PADDING)),
             column_gap: px(TAB_GAP),
-            border: tab_node.border,
-            border_radius: tab_node.border_radius,
+            border: tab_node.border.clone(),
+            border_radius: tab_node.border_radius.clone(),
             ..Default::default()
         },
         GlobalZIndex(DRAG_PROXY_Z),
@@ -1320,7 +1320,7 @@ mod tests {
         assert_eq!(drag_proxy.pointer_id, PointerId::Touch(4));
         let ghost = app.world().entity(proxy);
         assert_eq!(
-            ghost.get::<Outline>().map(|outline| outline.width),
+            ghost.get::<Outline>().map(|outline| outline.width.clone()),
             Some(px(1))
         );
         assert!(ghost.contains::<BoxShadow>());
@@ -1774,7 +1774,9 @@ mod tests {
         let world = app.world();
         let list = world.entity(list).get::<Node>().unwrap();
         let tab = world.entity(tab).get::<Node>().unwrap();
-        let (Val::Px(tab_height), Val::Px(min_height)) = (tab.min_height, list.min_height) else {
+        let (Val::Px(tab_height), Val::Px(min_height)) =
+            (tab.min_height.clone(), list.min_height.clone())
+        else {
             panic!("expected pixel heights");
         };
         let Val::Px(top) = list.padding.top else {

crates/bevy_feathers/src/controls/tree_view.rs

@@ -499,7 +499,7 @@ fn update_row_indent(
             if let Ok(mut node) = headers.get_mut(child)
                 && node.padding.left != left
             {
-                node.padding.left = left;
+                node.padding.left = left.clone();
             }
         }
     }

crates/bevy_feathers/src/rounded_corners.rs

@@ -45,49 +45,49 @@ impl RoundedCorners {
             RoundedCorners::All => BorderRadius::all(radius),
             RoundedCorners::TopLeft => BorderRadius {
                 top_left: radius,
-                top_right: zero,
-                bottom_right: zero,
+                top_right: zero.clone(),
+                bottom_right: zero.clone(),
                 bottom_left: zero,
             },
             RoundedCorners::TopRight => BorderRadius {
-                top_left: zero,
+                top_left: zero.clone(),
                 top_right: radius,
-                bottom_right: zero,
+                bottom_right: zero.clone(),
                 bottom_left: zero,
             },
             RoundedCorners::BottomRight => BorderRadius {
-                top_left: zero,
-                top_right: zero,
+                top_left: zero.clone(),
+                top_right: zero.clone(),
                 bottom_right: radius,
                 bottom_left: zero,
             },
             RoundedCorners::BottomLeft => BorderRadius {
-                top_left: zero,
-                top_right: zero,
+                top_left: zero.clone(),
+                top_right: zero.clone(),
                 bottom_right: zero,
                 bottom_left: radius,
             },
             RoundedCorners::Top => BorderRadius {
-                top_left: radius,
+                top_left: radius.clone(),
                 top_right: radius,
-                bottom_right: zero,
+                bottom_right: zero.clone(),
                 bottom_left: zero,
             },
             RoundedCorners::Right => BorderRadius {
-                top_left: zero,
-                top_right: radius,
+                top_left: zero.clone(),
+                top_right: radius.clone(),
                 bottom_right: radius,
                 bottom_left: zero,
             },
             RoundedCorners::Bottom => BorderRadius {
-                top_left: zero,
+                top_left: zero.clone(),
                 top_right: zero,
-                bottom_right: radius,
+                bottom_right: radius.clone(),
                 bottom_left: radius,
             },
             RoundedCorners::Left => BorderRadius {
-                top_left: radius,
-                top_right: zero,
+                top_left: radius.clone(),
+                top_right: zero.clone(),
                 bottom_right: zero,
                 bottom_left: radius,
             },

crates/bevy_inspector/src/column_split.rs

@@ -149,8 +149,8 @@ fn border_box(entity: Entity, nodes: &Query<Geometry>, scale: f32) -> Option<[f3
     let [left, right] = inner_box(parent?.parent(), nodes, scale, true)?;
     let margin = &node.margin;
     Some([
-        left + px_value(margin.left) * scale,
-        right - px_value(margin.right) * scale,
+        left + px_value(margin.left.clone()) * scale,
+        right - px_value(margin.right.clone()) * scale,
     ])
 }
 
@@ -171,8 +171,8 @@ fn inner_box(
     };
     let [inset_left, inset_right] = match computed.is_added() {
         true => [
-            side(node.border.left, node.padding.left),
-            side(node.border.right, node.padding.right),
+            side(node.border.left.clone(), node.padding.left.clone()),
+            side(node.border.right.clone(), node.padding.right.clone()),
         ],
         false => [inset.min_inset.x, inset.max_inset.x],
     };
@@ -237,7 +237,7 @@ fn update_column_splits(
         if is_handle && node.left != value {
             node.left = value;
         } else if !is_handle && node.width != value {
-            node.width = value;
+            node.width = value.clone();
             node.min_width = value;
         }
     }
@@ -509,7 +509,7 @@ mod tests {
         assert_eq!(app.world().get::<Children>(split).unwrap().len(), 1);
         let node = app.world().get::<Node>(handle).unwrap();
         assert_eq!(node.position_type, PositionType::Absolute);
-        assert_eq!((node.top, node.bottom), (px(0), px(0)));
+        assert_eq!((node.top.clone(), node.bottom.clone()), (px(0), px(0)));
         assert_eq!(
             app.world().get::<EntityCursor>(handle),
             Some(&EntityCursor::System(SystemCursorIcon::ColResize))
@@ -701,7 +701,7 @@ mod tests {
     fn widths(app: &App, nodes: &[Entity]) -> Vec<Val> {
         nodes
             .iter()
-            .map(|&entity| app.world().get::<Node>(entity).unwrap().width)
+            .map(|&entity| app.world().get::<Node>(entity).unwrap().width.clone())
             .collect()
     }
 

crates/bevy_ui/Cargo.toml

@@ -43,6 +43,7 @@ taffy = { version = "0.15", default-features = false, features = [
   "flexbox",
   "grid",
   "content_size",
+  "calc",
 ] }
 serde = { version = "1", features = ["derive"], optional = true }
 uuid = { version = "1.21.0", features = ["v4"], optional = true }
@@ -56,6 +57,7 @@ tracing = { version = "0.1", default-features = false, features = ["std"] }
 
 [dev-dependencies]
 bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.20.0-dev" }
+ron = "0.12"
 
 [features]
 default = []