forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update testbed_ui to use Improved Spawning API (#18329)

Browse Source 
# Objective

Contributes to #18238 
Updates the `text2d`, example to use the `children!` macro.

~~The SpawnIter usage in this example is maybe not the best. Very open
to opinions. I even left one `with_children` that I thought was just
much better than any alternative.~~

## Solution

Updates examples to use the Improved Spawning API merged in
https://github.com/bevyengine/bevy/pull/17521

## Testing

- Did you test these changes? If so, how?
- Opened the examples before and after and verified the same behavior
was observed. I did this on Ubuntu 24.04.2 LTS using `--features
wayland`.
- Are there any parts that need more testing?
- Other OS's and features can't hurt, but this is such a small change it
shouldn't be a problem.
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
  - Run the examples yourself with and without these changes.
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?
  - see above

---

## Showcase

n/a

## Migration Guide

n/a
This commit is contained in:
krunchington 2025-03-21 12:32:12 -07:00 committed by GitHub
parent 116484b37b
commit 9ae7aa4399
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 41 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
examples/testbed/ui.rs
View File

@ -105,26 +105,24 @@ mod grid {
pub fn setup(mut commands: Commands) { pub fn setup(mut commands: Commands) {
commands.spawn((Camera2d, StateScoped(super::Scene::Grid))); commands.spawn((Camera2d, StateScoped(super::Scene::Grid)));
// Top-level grid (app frame) // Top-level grid (app frame)
commands commands.spawn((
.spawn(( Node {
Node { display: Display::Grid,
display: Display::Grid, width: Val::Percent(100.0),
width: Val::Percent(100.0), height: Val::Percent(100.0),
height: Val::Percent(100.0), grid_template_columns: vec![GridTrack::min_content(), GridTrack::flex(1.0)],
grid_template_columns: vec![GridTrack::min_content(), GridTrack::flex(1.0)], grid_template_rows: vec![
grid_template_rows: vec![ GridTrack::auto(),
GridTrack::auto(), GridTrack::flex(1.0),
GridTrack::flex(1.0), GridTrack::px(40.),
GridTrack::px(40.), ],
], ..default()
..default() },
}, BackgroundColor(Color::WHITE),
BackgroundColor(Color::WHITE), StateScoped(super::Scene::Grid),
StateScoped(super::Scene::Grid), children![
))
.with_children(|builder| {
// Header // Header
builder.spawn(( (
Node { Node {
display: Display::Grid, display: Display::Grid,
grid_column: GridPlacement::span(2), grid_column: GridPlacement::span(2),
@ -132,34 +130,32 @@ mod grid {
..default() ..default()
}, },
BackgroundColor(RED.into()), BackgroundColor(RED.into()),
)); ),
// Main content grid (auto placed in row 2, column 1) // Main content grid (auto placed in row 2, column 1)
builder (
.spawn(( Node {
Node { height: Val::Percent(100.0),
height: Val::Percent(100.0), aspect_ratio: Some(1.0),
aspect_ratio: Some(1.0), display: Display::Grid,
display: Display::Grid, grid_template_columns: RepeatedGridTrack::flex(3, 1.0),
grid_template_columns: RepeatedGridTrack::flex(3, 1.0), grid_template_rows: RepeatedGridTrack::flex(2, 1.0),
grid_template_rows: RepeatedGridTrack::flex(2, 1.0), row_gap: Val::Px(12.0),
row_gap: Val::Px(12.0), column_gap: Val::Px(12.0),
column_gap: Val::Px(12.0), ..default()
..default() },
}, BackgroundColor(Color::srgb(0.25, 0.25, 0.25)),
BackgroundColor(Color::srgb(0.25, 0.25, 0.25)), children![
)) (Node::default(), BackgroundColor(ORANGE.into())),
.with_children(|builder| { (Node::default(), BackgroundColor(BISQUE.into())),
builder.spawn((Node::default(), BackgroundColor(ORANGE.into()))); (Node::default(), BackgroundColor(BLUE.into())),
builder.spawn((Node::default(), BackgroundColor(BISQUE.into()))); (Node::default(), BackgroundColor(CRIMSON.into())),
builder.spawn((Node::default(), BackgroundColor(BLUE.into()))); (Node::default(), BackgroundColor(AQUA.into())),
builder.spawn((Node::default(), BackgroundColor(CRIMSON.into()))); ]
builder.spawn((Node::default(), BackgroundColor(AQUA.into()))); ),
});
// Right side bar (auto placed in row 2, column 2) // Right side bar (auto placed in row 2, column 2)
builder.spawn((Node::DEFAULT, BackgroundColor(BLACK.into()))); (Node::DEFAULT, BackgroundColor(BLACK.into())),
}); ],
));
} }
} }