fix examples color_grading and mobile after BackgroundColor changes (#14033)

# Objective

- #14017 changed how `UiImage` and `BackgroundColor` work
- one change was missed in example `color_grading`, another in the
mobile example

## Solution

- Change it in the examples
This commit is contained in:
François Mockers 2024-06-26 14:54:23 +02:00 committed by François
parent 27aa9d2b7e
commit e65e4be98c
No known key found for this signature in database
2 changed files with 18 additions and 17 deletions

View File

@ -567,7 +567,11 @@ fn handle_button_presses(
/// Updates the state of the UI based on the current state. /// Updates the state of the UI based on the current state.
fn update_ui_state( fn update_ui_state(
mut buttons: Query<(&mut UiImage, &mut BorderColor, &ColorGradingOptionWidget)>, mut buttons: Query<(
&mut BackgroundColor,
&mut BorderColor,
&ColorGradingOptionWidget,
)>,
mut button_text: Query<(&mut Text, &ColorGradingOptionWidget), Without<HelpText>>, mut button_text: Query<(&mut Text, &ColorGradingOptionWidget), Without<HelpText>>,
mut help_text: Query<&mut Text, With<HelpText>>, mut help_text: Query<&mut Text, With<HelpText>>,
cameras: Query<Ref<ColorGrading>>, cameras: Query<Ref<ColorGrading>>,
@ -579,12 +583,12 @@ fn update_ui_state(
} }
// The currently-selected option is drawn with inverted colors. // The currently-selected option is drawn with inverted colors.
for (mut image, mut border_color, widget) in buttons.iter_mut() { for (mut background, mut border_color, widget) in buttons.iter_mut() {
if *currently_selected_option == widget.option { if *currently_selected_option == widget.option {
image.color = Color::WHITE; *background = Color::WHITE.into();
*border_color = Color::BLACK.into(); *border_color = Color::BLACK.into();
} else { } else {
image.color = Color::BLACK; *background = Color::BLACK.into();
*border_color = Color::WHITE.into(); *border_color = Color::WHITE.into();
} }
} }

View File

@ -114,21 +114,18 @@ fn setup_scene(
// Test ui // Test ui
commands commands
.spawn(( .spawn(ButtonBundle {
ButtonBundle { style: Style {
style: Style { justify_content: JustifyContent::Center,
justify_content: JustifyContent::Center, align_items: AlignItems::Center,
align_items: AlignItems::Center, position_type: PositionType::Absolute,
position_type: PositionType::Absolute, left: Val::Px(50.0),
left: Val::Px(50.0), right: Val::Px(50.0),
right: Val::Px(50.0), bottom: Val::Px(50.0),
bottom: Val::Px(50.0),
..default()
},
..default() ..default()
}, },
BackgroundColor(Color::WHITE), ..default()
)) })
.with_children(|b| { .with_children(|b| {
b.spawn( b.spawn(
TextBundle::from_section( TextBundle::from_section(