mirror of
https://github.com/bevyengine/bevy
synced 2024-09-20 22:42:08 +00:00
eaac730617
# Objective `Size::width` sets the `height` field to `Val::DEFAULT` which is `Val::Undefined`, but the default for `Size` `height` is `Val::Auto`. `Size::height` has the same problem, but with the `width` field. The UI examples specify numeric values in many places where they could either be elided or replaced by composition of the Flex enum properties. related: https://github.com/bevyengine/bevy/pull/7468 fixes: https://github.com/bevyengine/bevy/issues/6498 ## Solution Change `Size::width` so it sets `height` to `Val::AUTO` and change `Size::height` so it sets `width` to `Val::AUTO`. Added some tests so this doesn't happen again. ## Changelog Changed `Size::width` so it sets the `height` to `Val::AUTO`. Changed `Size::height` so it sets the `width` to `Val::AUTO`. Added tests to `geometry.rs` for `Size` and `UiRect` to ensure correct behaviour. Simplified the UI examples. Replaced numeric values with the Flex property enums or elided them where possible, and removed the remaining use of auto margins. ## Migration Guide The `Size::width` constructor function now sets the `height` to `Val::Auto` instead of `Val::Undefined`. The `Size::height` constructor function now sets the `width` to `Val::Auto` instead of `Val::Undefined`.
80 lines
2.7 KiB
Rust
80 lines
2.7 KiB
Rust
//! Showcases the `RelativeCursorPosition` component, used to check the position of the cursor relative to a UI node.
|
|
|
|
use bevy::{prelude::*, ui::RelativeCursorPosition, 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_startup_system(setup)
|
|
.add_system(relative_cursor_position_system)
|
|
.run();
|
|
}
|
|
|
|
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
commands.spawn(Camera2dBundle::default());
|
|
|
|
commands
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
size: Size::width(Val::Percent(100.)),
|
|
align_items: AlignItems::Center,
|
|
justify_content: JustifyContent::Center,
|
|
flex_direction: FlexDirection::Column,
|
|
..default()
|
|
},
|
|
..default()
|
|
})
|
|
.with_children(|parent| {
|
|
parent
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
size: Size::all(Val::Px(250.0)),
|
|
margin: UiRect::bottom(Val::Px(15.)),
|
|
..default()
|
|
},
|
|
background_color: Color::rgb(235., 35., 12.).into(),
|
|
..default()
|
|
})
|
|
.insert(RelativeCursorPosition::default());
|
|
|
|
parent.spawn(TextBundle {
|
|
text: Text::from_section(
|
|
"(0.0, 0.0)",
|
|
TextStyle {
|
|
font: asset_server.load("fonts/FiraSans-Bold.ttf"),
|
|
font_size: 40.0,
|
|
color: Color::rgb(0.9, 0.9, 0.9),
|
|
},
|
|
),
|
|
..default()
|
|
});
|
|
});
|
|
}
|
|
|
|
/// This systems polls the relative cursor position and displays its value in a text component.
|
|
fn relative_cursor_position_system(
|
|
relative_cursor_position_query: Query<&RelativeCursorPosition>,
|
|
mut output_query: Query<&mut Text>,
|
|
) {
|
|
let relative_cursor_position = relative_cursor_position_query.single();
|
|
|
|
let mut output = output_query.single_mut();
|
|
|
|
output.sections[0].value =
|
|
if let Some(relative_cursor_position) = relative_cursor_position.normalized {
|
|
format!(
|
|
"({:.1}, {:.1})",
|
|
relative_cursor_position.x, relative_cursor_position.y
|
|
)
|
|
} else {
|
|
"unknown".to_string()
|
|
};
|
|
|
|
output.sections[0].style.color = if relative_cursor_position.mouse_over() {
|
|
Color::rgb(0.1, 0.9, 0.1)
|
|
} else {
|
|
Color::rgb(0.9, 0.1, 0.1)
|
|
};
|
|
}
|