mirror of
https://github.com/bevyengine/bevy
synced 2024-11-23 05:03:47 +00:00
b995827013
# Objective Make `bevy_ui` "root" nodes more intuitive to use/style by: - Removing the implicit flexbox styling (such as stretch alignment) that is applied to them, and replacing it with more intuitive CSS Grid styling (notably with stretch alignment disabled in both axes). - Making root nodes layout independently of each other. Instead of there being a single implicit "viewport" node that all root nodes are children of, there is now an implicit "viewport" node *per root node*. And layout of each tree is computed separately. ## Solution - Remove the global implicit viewport node, and instead create an implicit viewport node for each user-specified root node. - Keep track of both the user-specified root nodes and the implicit viewport nodes in a separate `Vec`. - Use the window's size as the `available_space` parameter to `Taffy.compute_layout` rather than setting it on the implicit viewport node (and set the viewport to `height: 100%; width: 100%` to make this "just work"). --- ## Changelog - Bevy UI now lays out root nodes independently of each other in separate layout contexts. - The implicit viewport node (which contains each user-specified root node) is now `Display::Grid` with `align_items` and `justify_items` both set to `Start`. ## Migration Guide - Bevy UI now lays out root nodes independently of each other in separate layout contexts. If you were relying on your root nodes being able to affect each other's layouts, then you may need to wrap them in a single root node. - The implicit viewport node (which contains each user-specified root node) is now `Display::Grid` with `align_items` and `justify_items` both set to `Start`. You may need to add `height: Val::Percent(100.)` to your root nodes if you were previously relying on being implicitly set.
104 lines
3.5 KiB
Rust
104 lines
3.5 KiB
Rust
//! This example illustrates how to override the window scale factor imposed by the
|
|
//! operating system.
|
|
|
|
use bevy::{prelude::*, window::WindowResolution};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins.set(WindowPlugin {
|
|
primary_window: Some(Window {
|
|
resolution: WindowResolution::new(500., 300.).with_scale_factor_override(1.0),
|
|
..default()
|
|
}),
|
|
..default()
|
|
}))
|
|
.add_systems(Startup, setup)
|
|
.add_systems(
|
|
Update,
|
|
(display_override, toggle_override, change_scale_factor),
|
|
)
|
|
.run();
|
|
}
|
|
|
|
fn setup(mut commands: Commands) {
|
|
// camera
|
|
commands.spawn(Camera2dBundle::default());
|
|
// root node
|
|
commands
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
width: Val::Percent(100.0),
|
|
height: Val::Percent(100.0),
|
|
justify_content: JustifyContent::SpaceBetween,
|
|
..default()
|
|
},
|
|
..default()
|
|
})
|
|
.with_children(|parent| {
|
|
// left vertical fill (border)
|
|
parent
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
width: Val::Px(200.0),
|
|
height: Val::Percent(100.0),
|
|
border: UiRect::all(Val::Px(2.0)),
|
|
..default()
|
|
},
|
|
background_color: Color::rgb(0.65, 0.65, 0.65).into(),
|
|
..default()
|
|
})
|
|
.with_children(|parent| {
|
|
parent.spawn(
|
|
TextBundle::from_section(
|
|
"Example text",
|
|
TextStyle {
|
|
font_size: 30.0,
|
|
color: Color::WHITE,
|
|
..default()
|
|
},
|
|
)
|
|
.with_style(Style {
|
|
align_self: AlignSelf::FlexEnd,
|
|
..default()
|
|
}),
|
|
);
|
|
});
|
|
});
|
|
}
|
|
|
|
/// Set the title of the window to the current override
|
|
fn display_override(mut windows: Query<&mut Window>) {
|
|
let mut window = windows.single_mut();
|
|
|
|
window.title = format!(
|
|
"Scale override: {:?}",
|
|
window.resolution.scale_factor_override()
|
|
);
|
|
}
|
|
|
|
/// This system toggles scale factor overrides when enter is pressed
|
|
fn toggle_override(input: Res<Input<KeyCode>>, mut windows: Query<&mut Window>) {
|
|
let mut window = windows.single_mut();
|
|
|
|
if input.just_pressed(KeyCode::Return) {
|
|
let scale_factor_override = window.resolution.scale_factor_override();
|
|
window
|
|
.resolution
|
|
.set_scale_factor_override(scale_factor_override.xor(Some(1.0)));
|
|
}
|
|
}
|
|
|
|
/// This system changes the scale factor override when up or down is pressed
|
|
fn change_scale_factor(input: Res<Input<KeyCode>>, mut windows: Query<&mut Window>) {
|
|
let mut window = windows.single_mut();
|
|
let scale_factor_override = window.resolution.scale_factor_override();
|
|
if input.just_pressed(KeyCode::Up) {
|
|
window
|
|
.resolution
|
|
.set_scale_factor_override(scale_factor_override.map(|n| n + 1.0));
|
|
} else if input.just_pressed(KeyCode::Down) {
|
|
window
|
|
.resolution
|
|
.set_scale_factor_override(scale_factor_override.map(|n| (n - 1.0).max(1.0)));
|
|
}
|
|
}
|