Merge 0516a9bee6 into f964ee1e3a

crates/bevy_ui/src/geometry.rs

@@ -881,6 +881,11 @@ mod tests {
         let result = Val::Px(10.).resolve(1., size, viewport_size).unwrap();
 
         assert_eq!(result, 10.);
+
+        let result = Val::Px(10.).resolve(3., size, viewport_size).unwrap();
+        assert_eq!(result, 30.);
+        let result = Val::Px(10.).resolve(0.25, size, viewport_size).unwrap();
+        assert_eq!(result, 2.5);
     }
 
     #[test]

release-content/migration-guides/val_resolve_scale_factor_support.md

@@ -0,0 +1,6 @@
+---
+title: `Val::resolve` scale factor support
+pull_requests: [18164]
+---
+
+`Val::resolve` now has a scale factor parameter. To resolve a `Val` to a logical value use a scale factor of `1.`.