From d03f0c7dc172c2511742e1787f153e4707387561 Mon Sep 17 00:00:00 2001 From: Talin Date: Mon, 4 May 2026 00:54:17 +0100 Subject: [PATCH] Renamed `ToolButton` to `FeathersToolButton` to be consistent (#24098) with naming conventions for other widgets. # Objective The `ToolButton` widget was not consistently named like the other controls. ## Solution Renamed. ## Testing Basic manual testing. @cart --- crates/bevy_feathers/src/controls/button.rs | 4 ++-- examples/ui/widgets/feathers_gallery.rs | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/crates/bevy_feathers/src/controls/button.rs b/crates/bevy_feathers/src/controls/button.rs index 0b2caf7c1b..c1785d014d 100644 --- a/crates/bevy_feathers/src/controls/button.rs +++ b/crates/bevy_feathers/src/controls/button.rs @@ -121,9 +121,9 @@ impl FeathersButton { /// These events can be disabled by adding an [`bevy_ui::InteractionDisabled`] component to the entity #[derive(SceneComponent, Default, Clone)] #[scene(FeathersButtonProps)] -pub struct ToolButton; +pub struct FeathersToolButton; -impl ToolButton { +impl FeathersToolButton { fn scene(props: FeathersButtonProps) -> impl Scene { bsn! { :FeathersButton { diff --git a/examples/ui/widgets/feathers_gallery.rs b/examples/ui/widgets/feathers_gallery.rs index 9420769682..96428981af 100644 --- a/examples/ui/widgets/feathers_gallery.rs +++ b/examples/ui/widgets/feathers_gallery.rs @@ -15,7 +15,8 @@ use bevy::{ FeathersColorSwatch, FeathersDisclosureToggle, FeathersMenu, FeathersMenuButton, FeathersMenuDivider, FeathersMenuItem, FeathersMenuPopup, FeathersNumberInput, FeathersRadio, FeathersSlider, FeathersTextInput, FeathersTextInputContainer, - FeathersToggleSwitch, NumberInputValue, SliderBaseColor, ToolButton, UpdateNumberInput, + FeathersToggleSwitch, FeathersToolButton, NumberInputValue, SliderBaseColor, + UpdateNumberInput, }, cursor::{EntityCursor, OverrideCursor}, dark_theme::create_dark_theme, @@ -541,35 +542,35 @@ fn demo_column_2() -> impl Scene { ( :pane Children [ :pane_header Children [ - :ToolButton { + :FeathersToolButton { @variant: ButtonVariant::Primary, } Children [ (Text("\u{0398}") ThemedText) ], :pane_header_divider, - :ToolButton { + :FeathersToolButton { @variant: ButtonVariant::Plain, } Children [ (Text("\u{00BC}") ThemedText) ], - :ToolButton { + :FeathersToolButton { @variant: ButtonVariant::Plain, } Children [ (Text("\u{00BD}") ThemedText) ], - :ToolButton { + :FeathersToolButton { @variant: ButtonVariant::Plain, } Children [ (Text("\u{00BE}") ThemedText) ], :pane_header_divider, - :ToolButton { + :FeathersToolButton { @variant: ButtonVariant::Plain, } Children [ :icon(icons::CHEVRON_DOWN) ], :flex_spacer, - :ToolButton { + :FeathersToolButton { @variant: ButtonVariant::Plain, } Children [ :icon(icons::X)