Fix issues from rebase

Author: Weibye

crates/bevy_ui/src/geometry.rs

@@ -134,18 +134,6 @@ pub struct UiRect {
     pub bottom: Val,
 }
 
-impl UiRect<Val> {
-    /// ```rust
-    /// assert_eq!(UiRect<Val>::DEFAULT, UiRect<Val>::default());
-    /// ```
-    pub const DEFAULT: UiRect<Val> = UiRect {
-        left: Val::Undefined,
-        right: Val::Undefined,
-        top: Val::Undefined,
-        bottom: Val::Undefined,
-    };
-}
-
 impl UiRect {
     /// Creates a new [`UiRect`] from the values specified.
     ///
@@ -166,7 +154,7 @@ impl UiRect {
     /// assert_eq!(ui_rect.top, Val::Px(30.0));
     /// assert_eq!(ui_rect.bottom, Val::Px(40.0));
     /// ```
-    pub fn new(left: Val, right: Val, top: Val, bottom: Val) -> Self {
+    pub const fn new(left: Val, right: Val, top: Val, bottom: Val) -> Self {
         UiRect {
             left,
             right,
@@ -189,14 +177,35 @@ impl UiRect {
     /// assert_eq!(ui_rect.top, Val::Px(10.0));
     /// assert_eq!(ui_rect.bottom, Val::Px(10.0));
     /// ```
-    pub fn all(value: Val) -> Self {
+    pub const fn all(value: Val) -> Self {
         UiRect {
             left: value,
             right: value,
             top: value,
             bottom: value,
         }
     }
+
+    /// ```rust
+    /// assert_eq!(UiRect::DEFAULT, UiRect::default());
+    /// ```
+    pub const DEFAULT: UiRect = UiRect::UNDEFINED;
+
+    /// Creates a [`UiRect`] where all sides are [`Val::Undefined`]
+    pub const UNDEFINED: UiRect = UiRect {
+        left: Val::Undefined,
+        right: Val::Undefined,
+        top: Val::Undefined,
+        bottom: Val::Undefined,
+    };
+
+    /// Creates a [`UiRect`] where all sides are [`Val::Auto`]
+    pub const AUTO: UiRect = UiRect {
+        left: Val::Auto,
+        right: Val::Auto,
+        top: Val::Auto,
+        bottom: Val::Auto,
+    };
 }
 
 /// A 2-dimensional area defined by a width and height.
@@ -228,6 +237,8 @@ impl Size {
         Size { width, height }
     }
 
+    pub const DEFAULT: Size = Size::UNDEFINED;
+
     /// Creates a Size where both values are [`Val::Auto`].
     pub const AUTO: Size = Size {
         width: Val::Auto,
@@ -240,7 +251,8 @@ impl Size {
         height: Val::Undefined,
     };
 
-    pub const FULL: Size<Val> = Size {
+    /// Creates a Size where both values are 100 percent.
+    pub const FULL: Size = Size {
         width: Val::Percent(100.),
         height: Val::Percent(100.),
     };

crates/bevy_ui/src/layout_components.rs

@@ -54,7 +54,7 @@ pub enum PositionType {
     Reflect,
 )]
 #[reflect_value(PartialEq, Serialize, Deserialize)]
-pub struct Offset(pub UiRect<Val>);
+pub struct Offset(pub UiRect);
 
 /// Controls the size of UI nodes
 ///
@@ -64,11 +64,11 @@ pub struct Offset(pub UiRect<Val>);
 #[reflect_value(PartialEq, Serialize, Deserialize)]
 pub struct SizeConstraints {
     /// The minimum extent, which cannot be violated by the layouting algorithm
-    pub min: Size<Val>,
+    pub min: Size,
     /// The suggested extent, which will be used if other constraints can be comfortably satisfied
-    pub suggested: Size<Val>,
+    pub suggested: Size,
     /// The maximum extent, which cannot be violated by the layouting algorithm
-    pub max: Size<Val>,
+    pub max: Size,
     /// The expected aspect ratio, computed as width / height
     pub aspect_ratio: Option<f32>,
 }
@@ -121,11 +121,11 @@ impl SizeConstraints {
 #[reflect_value(PartialEq, Serialize, Deserialize)]
 pub struct Spacing {
     /// The space around the outside of the UI element
-    pub margin: UiRect<Val>,
+    pub margin: UiRect,
     /// The space around the inside of the UI element
-    pub padding: UiRect<Val>,
+    pub padding: UiRect,
     /// The space around the outside of the UI element that can be colored to create a visible border
-    pub border: UiRect<Val>,
+    pub border: UiRect,
 }
 
 impl Spacing {
@@ -150,7 +150,7 @@ impl Spacing {
     });
 
     /// Sets only the margin
-    pub const fn margin(rect: UiRect<Val>) -> Spacing {
+    pub const fn margin(rect: UiRect) -> Spacing {
         Spacing {
             margin: rect,
             ..Self::DEFAULT
@@ -171,7 +171,7 @@ impl Spacing {
     }
 
     /// Sets only the padding
-    pub const fn padding(rect: UiRect<Val>) -> Spacing {
+    pub const fn padding(rect: UiRect) -> Spacing {
         Spacing {
             padding: rect,
             ..Self::DEFAULT
@@ -192,7 +192,7 @@ impl Spacing {
     }
 
     /// Sets only the padding
-    pub const fn border(rect: UiRect<Val>) -> Spacing {
+    pub const fn border(rect: UiRect) -> Spacing {
         Spacing {
             border: rect,
             ..Self::DEFAULT

crates/bevy_ui/src/lib.rs

@@ -95,10 +95,7 @@ impl Plugin for UiPlugin {
             .register_type::<Overflow>()
             .register_type::<PositionType>()
             .register_type::<Size>()
-            .register_type::<Size<f32>>()
-            .register_type::<Size<Val>>()
             .register_type::<UiRect>()
-            .register_type::<UiRect<Val>>()
             .register_type::<FlexLayout>()
             .register_type::<UiColor>()
             .register_type::<UiImage>()