Ui Node Borders #7795

bevyengine/bevy#7795
hafiidz · Jul 20, 2023 · 5cae089 · 5cae089
1 parent b38efd1
commit 5cae089
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/bevy_proto_backend/src/impls/bevy_impls/ui.rs b/bevy_proto_backend/src/impls/bevy_impls/ui.rs
@@ -3,9 +3,9 @@ use bevy::math::{Rect, Vec2};
 use bevy::prelude::{BackgroundColor, Button, Label};
 use bevy::reflect::{std_traits::ReflectDefault, Reflect};
 use bevy::ui::{
-    AlignContent, AlignItems, AlignSelf, CalculatedClip, ContentSize, Direction, Display,
-    FlexDirection, FlexWrap, FocusPolicy, GridAutoFlow, GridPlacement, GridTrack, Interaction,
-    JustifyContent, JustifyItems, JustifySelf, Node, Overflow, PositionType,
+    AlignContent, AlignItems, AlignSelf, BorderColor, CalculatedClip, ContentSize, Direction,
+    Display, FlexDirection, FlexWrap, FocusPolicy, GridAutoFlow, GridPlacement, GridTrack,
+    Interaction, JustifyContent, JustifyItems, JustifySelf, Node, Overflow, PositionType,
     RelativeCursorPosition, RepeatedGridTrack, Style, UiImage, UiRect, Val, ZIndex,
 };
 
@@ -58,6 +58,20 @@ impl_external_schematic! {
     }
 }
 
+impl_external_schematic! {
+    #[schematic(from = BorderColorInput)]
+    struct BorderColor();
+    // ---
+    #[derive(Reflect)]
+    #[reflect(Default)]
+    pub struct BorderColorInput(pub ProtoColor);
+    from_to_default! {
+        BorderColor,
+        BorderColorInput,
+        |value: Input| Self(value.0.into())
+    }
+}
+
 impl_external_schematic! {
     #[schematic(from = ButtonInput)]
     struct Button;

diff --git a/src/custom.rs b/src/custom.rs
@@ -531,6 +531,8 @@ pub struct ButtonBundle {
     #[reflect(default)]
     pub background_color: bevy_impls::ui::BackgroundColorInput,
     #[reflect(default)]
+    pub background_color: bevy_impls::ui::BorderColorInput,
+    #[reflect(default)]
     pub image: bevy_impls::ui::UiImageInput,
     #[reflect(default)]
     pub transform: Transform,
@@ -554,6 +556,7 @@ impl FromSchematicInput<ButtonBundle> for bevy::ui::node_bundles::ButtonBundle {
             interaction: input.interaction.into(),
             focus_policy: input.focus_policy.into(),
             background_color: input.background_color.into(),
+            border_color: input.border_color.into(),
             image: bevy::ui::UiImage::from_input(input.image, context),
             transform: input.transform,
             global_transform: input.global_transform,