Spacing *_all helper methods for even spacing on all sides

bevyengine · Aug 1, 2022 · b4b7b0b · b4b7b0b
1 parent c5a319e
commit b4b7b0b
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 5 deletions.
diff --git a/crates/bevy_ui/src/layout_components.rs b/crates/bevy_ui/src/layout_components.rs
@@ -157,6 +157,19 @@ impl Spacing {
         }
     }
 
+    /// Sets the margin on all sides to `val`
+    pub const fn margin_all(val: Val) -> Spacing {
+        Spacing {
+            margin: UiRect {
+                left: val,
+                right: val,
+                bottom: val,
+                top: val,
+            },
+            ..Self::DEFAULT
+        }
+    }
+
     /// Sets only the padding
     pub const fn padding(rect: UiRect<Val>) -> Spacing {
         Spacing {
@@ -165,13 +178,39 @@ impl Spacing {
         }
     }
 
+    /// Sets the padding on all sides to `val`
+    pub const fn padding_all(val: Val) -> Spacing {
+        Spacing {
+            padding: UiRect {
+                left: val,
+                right: val,
+                bottom: val,
+                top: val,
+            },
+            ..Self::DEFAULT
+        }
+    }
+
     /// Sets only the padding
     pub const fn border(rect: UiRect<Val>) -> Spacing {
         Spacing {
             border: rect,
             ..Self::DEFAULT
         }
     }
+
+    /// Sets the border on all sides to `val`
+    pub const fn border_all(val: Val) -> Spacing {
+        Spacing {
+            border: UiRect {
+                left: val,
+                right: val,
+                bottom: val,
+                top: val,
+            },
+            ..Self::DEFAULT
+        }
+    }
 }
 
 /// Defines the text direction

diff --git a/examples/games/game_menu.rs b/examples/games/game_menu.rs
@@ -172,7 +172,7 @@ mod game {
                             color: TEXT_COLOR,
                         },
                     ))
-                    .insert(Spacing::margin(UiRect::all(Val::Px(50.0))));
+                    .insert(Spacing::margin_all(Val::Px(50.0)));
 
                 parent
                     .spawn_bundle(TextBundle::from_sections([
@@ -201,7 +201,7 @@ mod game {
                             },
                         ),
                     ]))
-                    .insert(Spacing::margin(UiRect::all(Val::Px(50.0))));
+                    .insert(Spacing::margin_all(Val::Px(50.0)));
             });
         // Spawn a 5 seconds timer to trigger going back to the menu
         commands.insert_resource(GameTimer(Timer::from_seconds(5.0, false)));

diff --git a/examples/ui/ui.rs b/examples/ui/ui.rs
@@ -39,7 +39,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                         Val::Px(200.0),
                         Val::Percent(100.0),
                     ),
-                    spacing: Spacing::border(UiRect::all(Val::Px(2.0))),
+                    spacing: Spacing::border_all(Val::Px(2.0)),
                     color: Color::rgb(0.65, 0.65, 0.65).into(),
                     ..default()
                 })
@@ -66,7 +66,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                                         color: Color::WHITE,
                                     },
                                 ))
-                                .insert(Spacing::margin(UiRect::all(Val::Px(5.0))));
+                                .insert(Spacing::margin_all(Val::Px(5.0)));
                         });
                 });
             // right vertical fill

diff --git a/examples/window/scale_factor_override.rs b/examples/window/scale_factor_override.rs
@@ -36,7 +36,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
             parent
                 .spawn_bundle(NodeBundle {
                     size_constraints: SizeConstraints::suggested(Val::Px(200.), Val::FULL),
-                    spacing: Spacing::border(UiRect::all(Val::Px(2.0))),
+                    spacing: Spacing::border_all(Val::Px(2.0)),
                     color: Color::rgb(0.65, 0.65, 0.65).into(),
                     ..default()
                 })