Restore bevy_feathers features after merge with upstream (#41)

* Restore the panes in the feathers example

* Migrate tool_button to use EntityCursor

* Remove unused imports

* Fix AlphaPattern with bsn! and simplify handle initialization

Author: villor

crates/bevy_feathers/src/alpha_pattern.rs

@@ -1,13 +1,5 @@
-use bevy_app::Plugin;
-use bevy_asset::{Asset, Assets, Handle};
-use bevy_ecs::{
-    component::Component,
-    lifecycle::Add,
-    observer::On,
-    resource::Resource,
-    system::{Query, Res},
-    world::FromWorld,
-};
+use bevy_asset::{Asset, Assets};
+use bevy_ecs::{component::Component, lifecycle::HookContext, world::DeferredWorld};
 use bevy_reflect::TypePath;
 use bevy_render::render_resource::{AsBindGroup, ShaderRef};
 use bevy_ui_render::ui_material::{MaterialNode, UiMaterial};
@@ -21,39 +13,28 @@ impl UiMaterial for AlphaPatternMaterial {
     }
 }
 
-#[derive(Resource)]
-pub(crate) struct AlphaPatternResource(pub(crate) Handle<AlphaPatternMaterial>);
-
-impl FromWorld for AlphaPatternResource {
-    fn from_world(world: &mut bevy_ecs::world::World) -> Self {
-        let mut ui_materials = world
-            .get_resource_mut::<Assets<AlphaPatternMaterial>>()
-            .unwrap();
-        Self(ui_materials.add(AlphaPatternMaterial::default()))
-    }
-}
-
 /// Marker that tells us we want to fill in the [`MaterialNode`] with the alpha material.
 #[derive(Component, Default, Clone)]
+#[require(MaterialNode<AlphaPatternMaterial>)]
+#[component(on_add = on_add_alpha_pattern)]
 pub(crate) struct AlphaPattern;
 
 /// Observer to fill in the material handle (since we don't have access to the materials asset
 /// in the template)
-fn on_add_alpha_pattern(
-    ev: On<Add, AlphaPattern>,
-    mut q_material_node: Query<&mut MaterialNode<AlphaPatternMaterial>>,
-    r_material: Res<AlphaPatternResource>,
-) {
-    if let Ok(mut material) = q_material_node.get_mut(ev.target()) {
-        material.0 = r_material.0.clone();
-    }
-}
-
-/// Plugin which registers the systems for updating the button styles.
-pub struct AlphaPatternPlugin;
-
-impl Plugin for AlphaPatternPlugin {
-    fn build(&self, app: &mut bevy_app::App) {
-        app.add_observer(on_add_alpha_pattern);
+fn on_add_alpha_pattern(mut world: DeferredWorld, context: HookContext) {
+    let mut materials = world.resource_mut::<Assets<AlphaPatternMaterial>>();
+
+    let handle = if materials.is_empty() {
+        materials.add(AlphaPatternMaterial::default())
+    } else {
+        let id = materials.iter().next().unwrap().0;
+        materials.get_strong_handle(id).unwrap()
+    };
+
+    if let Some(mut material) = world
+        .entity_mut(context.entity)
+        .get_mut::<MaterialNode<AlphaPatternMaterial>>()
+    {
+        material.0 = handle;
     }
 }

crates/bevy_feathers/src/controls/button.rs

@@ -21,7 +21,6 @@ use crate::{
     tokens,
 };
 use bevy_input_focus::tab_navigation::TabIndex;
-use bevy_winit::cursor::CursorIcon;
 
 /// Color variants for buttons. This also functions as a component used by the dynamic styling
 /// system to identify which entities are buttons.
@@ -100,8 +99,7 @@ pub fn tool_button(props: ButtonProps) -> impl Scene {
         template_value(props.variant)
         template_value(props.corners.to_border_radius(3.0))
         Hovered
-        // TODO: port CursonIcon to GetTemplate
-        // CursorIcon::System(bevy_window::SystemCursorIcon::Pointer)
+        EntityCursor::System(bevy_window::SystemCursorIcon::Pointer)
         TabIndex(0)
         ThemeBackgroundColor(tokens::BUTTON_BG)
         ThemeFontColor(tokens::BUTTON_TEXT)

crates/bevy_feathers/src/controls/color_swatch.rs

@@ -1,15 +1,9 @@
-use bevy_asset::Handle;
 use bevy_color::Alpha;
 use bevy_ecs::component::Component;
+use bevy_scene2::{bsn, Scene};
 use bevy_ui::{BackgroundColor, BorderRadius, Node, PositionType, Val};
-use bevy_ui_render::ui_material::MaterialNode;
 
-use crate::{
-    alpha_pattern::{AlphaPattern, AlphaPatternMaterial},
-    constants::size,
-    palette,
-};
-use bevy_scene2::{bsn, Scene};
+use crate::{alpha_pattern::AlphaPattern, constants::size, palette};
 
 /// Marker identifying a color swatch.
 #[derive(Component, Default, Clone)]
@@ -33,7 +27,6 @@ pub fn color_swatch() -> impl Scene {
         }
         ColorSwatch
         AlphaPattern
-        MaterialNode::<AlphaPatternMaterial>(Handle::default())
         BorderRadius::all(Val::Px(5.0))
         [
             Node {

crates/bevy_feathers/src/controls/mod.rs

@@ -15,15 +15,12 @@ pub use radio::{radio, RadioPlugin};
 pub use slider::{slider, SliderPlugin, SliderProps};
 pub use toggle_switch::{toggle_switch, ToggleSwitchPlugin, ToggleSwitchProps};
 
-use crate::alpha_pattern::AlphaPatternPlugin;
-
 /// Plugin which registers all `bevy_feathers` controls.
 pub struct ControlsPlugin;
 
 impl Plugin for ControlsPlugin {
     fn build(&self, app: &mut bevy_app::App) {
         app.add_plugins((
-            AlphaPatternPlugin,
             ButtonPlugin,
             CheckboxPlugin,
             RadioPlugin,

crates/bevy_feathers/src/controls/toggle_switch.rs

@@ -1,7 +1,7 @@
 use accesskit::Role;
 use bevy_a11y::AccessibilityNode;
 use bevy_app::{Plugin, PreUpdate};
-use bevy_core_widgets::{Callback, CallbackTemplate, CoreCheckbox, ValueChange};
+use bevy_core_widgets::{CallbackTemplate, CoreCheckbox, ValueChange};
 use bevy_ecs::{
     component::Component,
     entity::Entity,

crates/bevy_feathers/src/cursor.rs

@@ -9,7 +9,6 @@ use bevy_ecs::{
     resource::Resource,
     schedule::IntoScheduleConfigs,
     system::{Commands, Query, Res},
-    template::GetTemplate,
     VariantDefaults,
 };
 use bevy_picking::{hover::HoverMap, pointer::PointerId, PickingSystems};

crates/bevy_feathers/src/lib.rs

@@ -25,7 +25,7 @@ use bevy_text::{TextColor, TextFont};
 use bevy_ui_render::UiMaterialPlugin;
 
 use crate::{
-    alpha_pattern::{AlphaPatternMaterial, AlphaPatternResource},
+    alpha_pattern::AlphaPatternMaterial,
     controls::ControlsPlugin,
     cursor::{CursorIconPlugin, DefaultCursor, EntityCursor},
     theme::{ThemedText, UiTheme},
@@ -78,7 +78,5 @@ impl Plugin for FeathersPlugin {
             .add_observer(theme::on_changed_border)
             .add_observer(theme::on_changed_font_color)
             .add_observer(font_styles::on_changed_font);
-
-        app.init_resource::<AlphaPatternResource>();
     }
 }

examples/ui/feathers.rs

@@ -12,7 +12,7 @@ use bevy::{
             subpane_header,
         },
         controls::{
-            button, checkbox, color_swatch, radio, slider, toggle_switch, ButtonProps,
+            button, checkbox, color_swatch, radio, slider, toggle_switch, tool_button, ButtonProps,
             ButtonVariant, CheckboxProps, SliderProps, ToggleSwitchProps,
         },
         dark_theme::create_dark_theme,
@@ -222,6 +222,82 @@ fn demo_root() -> impl Scene {
                     SliderPrecision(2)
                 ),
                 color_swatch(),
+            ],
+            Node {
+                display: Display::Flex,
+                flex_direction: FlexDirection::Column,
+                align_items: AlignItems::Stretch,
+                justify_content: JustifyContent::Start,
+                padding: UiRect::all(Val::Px(8.0)),
+                row_gap: Val::Px(8.0),
+                width: Val::Percent(30.),
+                min_width: Val::Px(200.),
+            } [
+                (
+                    :subpane [
+                        :subpane_header [
+                            (Text("Left") ThemedText),
+                            (Text("Center") ThemedText),
+                            (Text("Right") ThemedText)
+                        ],
+                        :subpane_body [
+                            (Text("Body") ThemedText),
+                        ],
+                    ]
+                ),
+                (
+                    :pane [
+                        :pane_header [
+                            :tool_button(ButtonProps {
+                                variant: ButtonVariant::Selected,
+                                ..default()
+                            }) [
+                                (Text("\u{0398}") ThemedText)
+                            ],
+                            :pane_header_divider,
+                            :tool_button(ButtonProps{
+                                variant: ButtonVariant::Plain,
+                                ..default()
+                            }) [
+                                (Text("\u{00BC}") ThemedText)
+                            ],
+                            :tool_button(ButtonProps{
+                                variant: ButtonVariant::Plain,
+                                ..default()
+                            }) [
+                                (Text("\u{00BD}") ThemedText)
+                            ],
+                            :tool_button(ButtonProps{
+                                variant: ButtonVariant::Plain,
+                                ..default()
+                            }) [
+                                (Text("\u{00BE}") ThemedText)
+                            ],
+                            :pane_header_divider,
+                            :tool_button(ButtonProps{
+                                variant: ButtonVariant::Plain,
+                                ..default()
+                            }) [
+                                (Text("\u{20AC}") ThemedText)
+                            ],
+                            :flex_spacer,
+                            :tool_button(ButtonProps{
+                                variant: ButtonVariant::Plain,
+                                ..default()
+                            }) [
+                                (Text("\u{00D7}") ThemedText)
+                            ],
+                        ],
+                        (
+                            :pane_body [
+                                (Text("Some") ThemedText),
+                                (Text("Content") ThemedText),
+                                (Text("Here") ThemedText),
+                            ]
+                            BackgroundColor(palettes::tailwind::EMERALD_800)
+                        ),
+                    ]
+                )
             ]
         ]
     }