Add Border and BorderRadius components to bevy_ui

Author: oceantume

crates/bevy_ui/src/node_bundles.rs

@@ -4,8 +4,8 @@
 use crate::widget::TextFlags;
 use crate::{
     widget::{Button, UiImageSize},
-    BackgroundColor, BorderColor, ContentSize, FocusPolicy, Interaction, Node, Style, UiImage,
-    UiMaterial, ZIndex,
+    BackgroundColor, Border, BorderColor, BorderRadius, ContentSize, FocusPolicy, Interaction,
+    Node, Style, UiImage, UiMaterial, ZIndex,
 };
 use bevy_asset::Handle;
 use bevy_ecs::bundle::Bundle;
@@ -50,6 +50,10 @@ pub struct NodeBundle {
     pub visibility: Visibility,
     /// Inherited visibility of an entity.
     pub inherited_visibility: InheritedVisibility,
+    /// Describes the border radius of the node
+    pub border_radius: BorderRadius,
+    /// Describes the visual properties of the node's border
+    pub border: Border,
     /// Algorithmically-computed indication of whether an entity is visible and should be extracted for rendering
     pub view_visibility: ViewVisibility,
     /// Indicates the depth at which the node should appear in the UI
@@ -70,6 +74,8 @@ impl Default for NodeBundle {
             visibility: Default::default(),
             inherited_visibility: Default::default(),
             view_visibility: Default::default(),
+            border_radius: Default::default(),
+            border: Default::default(),
             z_index: Default::default(),
         }
     }
@@ -115,6 +121,10 @@ pub struct ImageBundle {
     pub visibility: Visibility,
     /// Inherited visibility of an entity.
     pub inherited_visibility: InheritedVisibility,
+    /// Describes the border radius of the node
+    pub border_radius: BorderRadius,
+    /// Describes the visual properties of the node's border
+    pub border: Border,
     /// Algorithmically-computed indication of whether an entity is visible and should be extracted for rendering
     pub view_visibility: ViewVisibility,
     /// Indicates the depth at which the node should appear in the UI
@@ -386,6 +396,10 @@ pub struct MaterialNodeBundle<M: UiMaterial> {
     pub visibility: Visibility,
     /// Inherited visibility of an entity.
     pub inherited_visibility: InheritedVisibility,
+    /// Describes the border radius of the node
+    pub border_radius: BorderRadius,
+    /// Describes the visual properties of the node's border
+    pub border: Border,
     /// Algorithmically-computed indication of whether an entity is visible and should be extracted for rendering
     pub view_visibility: ViewVisibility,
     /// Indicates the depth at which the node should appear in the UI
@@ -402,6 +416,8 @@ impl<M: UiMaterial> Default for MaterialNodeBundle<M> {
             transform: Default::default(),
             global_transform: Default::default(),
             visibility: Default::default(),
+            border_radius: Default::default(),
+            border: Default::default(),
             inherited_visibility: Default::default(),
             view_visibility: Default::default(),
             z_index: Default::default(),

crates/bevy_ui/src/ui_node.rs

@@ -1917,3 +1917,48 @@ impl<'w, 's> DefaultUiCamera<'w, 's> {
         })
     }
 }
+
+/// The border radius of the node
+///
+/// This doesn't require a [`Border`] component
+#[derive(Component, Default, Copy, Clone, Debug, Reflect)]
+#[reflect(Component)]
+pub struct BorderRadius {
+    pub top_left: f32,
+    pub bottom_left: f32,
+    pub top_right: f32,
+    pub bottom_right: f32,
+}
+
+impl BorderRadius {
+    pub fn all(border_radius: f32) -> Self {
+        Self {
+            top_left: border_radius,
+            bottom_left: border_radius,
+            top_right: border_radius,
+            bottom_right: border_radius,
+        }
+    }
+
+    pub fn to_array(&self) -> [f32; 4] {
+        [
+            self.top_left,
+            self.bottom_left,
+            self.top_right,
+            self.bottom_right,
+        ]
+    }
+}
+
+/// The visual properties of the node's border
+#[derive(Component, Default, Copy, Clone, Debug, Reflect)]
+#[reflect(Component)]
+pub struct Border {
+    /// The width of the border
+    ///
+    /// This is different from [`Style`] border and it will not cause any displacement inside the node.
+    pub width: f32,
+
+    /// The color of the border
+    pub color: LegacyColor,
+}