eb19a9ea0b
# Objective - Migrate UI bundles to required components, fixes #15889 ## Solution - deprecate `NodeBundle` in favor of `Node` - deprecate `ImageBundle` in favor of `UiImage` - deprecate `ButtonBundle` in favor of `Button` ## Testing CI. ## Migration Guide - Replace all uses of `NodeBundle` with `Node`. e.g. ```diff commands - .spawn(NodeBundle { - style: Style { + .spawn(( + Node::default(), + Style { width: Val::Percent(100.), align_items: AlignItems::Center, justify_content: JustifyContent::Center, ..default() }, - ..default() - }) + )) ``` - Replace all uses of `ButtonBundle` with `Button`. e.g. ```diff .spawn(( - ButtonBundle { - style: Style { - width: Val::Px(w), - height: Val::Px(h), - // horizontally center child text - justify_content: JustifyContent::Center, - // vertically center child text - align_items: AlignItems::Center, - margin: UiRect::all(Val::Px(20.0)), - ..default() - }, - image: image.clone().into(), + Button, + Style { + width: Val::Px(w), + height: Val::Px(h), + // horizontally center child text + justify_content: JustifyContent::Center, + // vertically center child text + align_items: AlignItems::Center, + margin: UiRect::all(Val::Px(20.0)), ..default() }, + UiImage::from(image.clone()), ImageScaleMode::Sliced(slicer.clone()), )) ``` - Replace all uses of `ImageBundle` with `UiImage`. e.g. ```diff - commands.spawn(ImageBundle { - image: UiImage { + commands.spawn(( + UiImage { texture: metering_mask, ..default() }, - style: Style { + Style { width: Val::Percent(100.0), height: Val::Percent(100.0), ..default() }, - ..default() - }); + )); ``` --------- Co-authored-by: Carter Anderson <mcanders1@gmail.com>
102 lines
4.2 KiB
Rust
102 lines
4.2 KiB
Rust
//! Simple example demonstrating the `OverflowClipMargin` style property.
|
|
|
|
use bevy::{color::palettes::css::*, prelude::*, winit::WinitSettings};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
// Only run the app when there is user input. This will significantly reduce CPU/GPU use.
|
|
.insert_resource(WinitSettings::desktop_app())
|
|
.add_systems(Startup, setup)
|
|
.run();
|
|
}
|
|
|
|
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
commands.spawn(Camera2d);
|
|
|
|
let image = asset_server.load("branding/icon.png");
|
|
|
|
commands
|
|
.spawn((
|
|
Node::default(),
|
|
Style {
|
|
width: Val::Percent(100.),
|
|
height: Val::Percent(100.),
|
|
align_items: AlignItems::Center,
|
|
justify_content: JustifyContent::Center,
|
|
row_gap: Val::Px(40.),
|
|
flex_direction: FlexDirection::Column,
|
|
..default()
|
|
},
|
|
BackgroundColor(ANTIQUE_WHITE.into()),
|
|
))
|
|
.with_children(|parent| {
|
|
for overflow_clip_margin in [
|
|
OverflowClipMargin::border_box().with_margin(25.),
|
|
OverflowClipMargin::border_box(),
|
|
OverflowClipMargin::padding_box(),
|
|
OverflowClipMargin::content_box(),
|
|
] {
|
|
parent
|
|
.spawn((
|
|
Node::default(),
|
|
Style {
|
|
flex_direction: FlexDirection::Row,
|
|
column_gap: Val::Px(20.),
|
|
..default()
|
|
},
|
|
))
|
|
.with_children(|parent| {
|
|
parent
|
|
.spawn((
|
|
Node::default(),
|
|
Style {
|
|
padding: UiRect::all(Val::Px(10.)),
|
|
margin: UiRect::bottom(Val::Px(25.)),
|
|
..default()
|
|
},
|
|
BackgroundColor(Color::srgb(0.25, 0.25, 0.25)),
|
|
))
|
|
.with_child(Text(format!("{overflow_clip_margin:#?}")));
|
|
|
|
parent
|
|
.spawn((
|
|
Node::default(),
|
|
Style {
|
|
margin: UiRect::top(Val::Px(10.)),
|
|
width: Val::Px(100.),
|
|
height: Val::Px(100.),
|
|
padding: UiRect::all(Val::Px(20.)),
|
|
border: UiRect::all(Val::Px(5.)),
|
|
overflow: Overflow::clip(),
|
|
overflow_clip_margin,
|
|
..default()
|
|
},
|
|
BackgroundColor(GRAY.into()),
|
|
BorderColor(Color::BLACK),
|
|
))
|
|
.with_children(|parent| {
|
|
parent
|
|
.spawn((
|
|
Node::default(),
|
|
Style {
|
|
min_width: Val::Px(50.),
|
|
min_height: Val::Px(50.),
|
|
..default()
|
|
},
|
|
BackgroundColor(LIGHT_CYAN.into()),
|
|
))
|
|
.with_child((
|
|
UiImage::new(image.clone()),
|
|
Style {
|
|
min_width: Val::Px(100.),
|
|
min_height: Val::Px(100.),
|
|
..default()
|
|
},
|
|
));
|
|
});
|
|
});
|
|
}
|
|
});
|
|
}
|