989fb8a78d
# Objective - Closes #335. - Related #4285. - Part of the splitting process of #3503. ## Solution - Move `Rect` to `bevy_ui` and rename it to `UiRect`. ## Reasons - `Rect` is only used in `bevy_ui` and therefore calling it `UiRect` makes the intent clearer. - We have two types that are called `Rect` currently and it's missleading (see `bevy_sprite::Rect` and #335). - Discussion in #3503. ## Changelog ### Changed - The `Rect` type got moved from `bevy_math` to `bevy_ui` and renamed to `UiRect`. ## Migration Guide - The `Rect` type got renamed to `UiRect`. To migrate you just have to change every occurrence of `Rect` to `UiRect`. Co-authored-by: KDecay <KDecayMusic@protonmail.com>
82 lines
2.9 KiB
Rust
82 lines
2.9 KiB
Rust
use bevy::prelude::*;
|
|
|
|
/// This example illustrates how to customize the default window settings
|
|
fn main() {
|
|
App::new()
|
|
.insert_resource(WindowDescriptor {
|
|
width: 500.,
|
|
height: 300.,
|
|
..default()
|
|
})
|
|
.add_plugins(DefaultPlugins)
|
|
.add_startup_system(setup)
|
|
.add_system(toggle_override)
|
|
.add_system(change_scale_factor)
|
|
.run();
|
|
}
|
|
|
|
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
// ui camera
|
|
commands.spawn_bundle(UiCameraBundle::default());
|
|
// root node
|
|
commands
|
|
.spawn_bundle(NodeBundle {
|
|
style: Style {
|
|
size: Size::new(Val::Percent(100.0), Val::Percent(100.0)),
|
|
justify_content: JustifyContent::SpaceBetween,
|
|
..default()
|
|
},
|
|
color: Color::NONE.into(),
|
|
..default()
|
|
})
|
|
.with_children(|parent| {
|
|
// left vertical fill (border)
|
|
parent
|
|
.spawn_bundle(NodeBundle {
|
|
style: Style {
|
|
size: Size::new(Val::Px(200.0), Val::Percent(100.0)),
|
|
border: UiRect::all(Val::Px(2.0)),
|
|
..default()
|
|
},
|
|
color: Color::rgb(0.65, 0.65, 0.65).into(),
|
|
..default()
|
|
})
|
|
.with_children(|parent| {
|
|
parent.spawn_bundle(TextBundle {
|
|
style: Style {
|
|
align_self: AlignSelf::FlexEnd,
|
|
..default()
|
|
},
|
|
text: Text::with_section(
|
|
"Example text",
|
|
TextStyle {
|
|
font: asset_server.load("fonts/FiraSans-Bold.ttf"),
|
|
font_size: 30.0,
|
|
color: Color::WHITE,
|
|
},
|
|
Default::default(),
|
|
),
|
|
..default()
|
|
});
|
|
});
|
|
});
|
|
}
|
|
|
|
/// This system toggles scale factor overrides when enter is pressed
|
|
fn toggle_override(input: Res<Input<KeyCode>>, mut windows: ResMut<Windows>) {
|
|
let window = windows.primary_mut();
|
|
if input.just_pressed(KeyCode::Return) {
|
|
window.set_scale_factor_override(window.scale_factor_override().xor(Some(1.)));
|
|
}
|
|
}
|
|
|
|
/// This system changes the scale factor override when up or down is pressed
|
|
fn change_scale_factor(input: Res<Input<KeyCode>>, mut windows: ResMut<Windows>) {
|
|
let window = windows.primary_mut();
|
|
if input.just_pressed(KeyCode::Up) {
|
|
window.set_scale_factor_override(window.scale_factor_override().map(|n| n + 1.));
|
|
} else if input.just_pressed(KeyCode::Down) {
|
|
window.set_scale_factor_override(window.scale_factor_override().map(|n| (n - 1.).max(1.)));
|
|
}
|
|
}
|