ddfafab971
# Objective Fix https://github.com/bevyengine/bevy/issues/4530 - Make it easier to open/close/modify windows by setting them up as `Entity`s with a `Window` component. - Make multiple windows very simple to set up. (just add a `Window` component to an entity and it should open) ## Solution - Move all properties of window descriptor to ~components~ a component. - Replace `WindowId` with `Entity`. - ~Use change detection for components to update backend rather than events/commands. (The `CursorMoved`/`WindowResized`/... events are kept for user convenience.~ Check each field individually to see what we need to update, events are still kept for user convenience. --- ## Changelog - `WindowDescriptor` renamed to `Window`. - Width/height consolidated into a `WindowResolution` component. - Requesting maximization/minimization is done on the [`Window::state`] field. - `WindowId` is now `Entity`. ## Migration Guide - Replace `WindowDescriptor` with `Window`. - Change `width` and `height` fields in a `WindowResolution`, either by doing ```rust WindowResolution::new(width, height) // Explicitly // or using From<_> for tuples for convenience (1920., 1080.).into() ``` - Replace any `WindowCommand` code to just modify the `Window`'s fields directly and creating/closing windows is now by spawning/despawning an entity with a `Window` component like so: ```rust let window = commands.spawn(Window { ... }).id(); // open window commands.entity(window).despawn(); // close window ``` ## Unresolved - ~How do we tell when a window is minimized by a user?~ ~Currently using the `Resize(0, 0)` as an indicator of minimization.~ No longer attempting to tell given how finnicky this was across platforms, now the user can only request that a window be maximized/minimized. ## Future work - Move `exit_on_close` functionality out from windowing and into app(?) - https://github.com/bevyengine/bevy/issues/5621 - https://github.com/bevyengine/bevy/issues/7099 - https://github.com/bevyengine/bevy/issues/7098 Co-authored-by: Carter Anderson <mcanders1@gmail.com>
119 lines
3.5 KiB
Rust
119 lines
3.5 KiB
Rust
use bevy::{
|
|
diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
|
|
prelude::*,
|
|
window::{PresentMode, WindowPlugin},
|
|
};
|
|
|
|
// For a total of 110 * 110 = 12100 buttons with text
|
|
const ROW_COLUMN_COUNT: usize = 110;
|
|
const FONT_SIZE: f32 = 7.0;
|
|
|
|
/// This example shows what happens when there is a lot of buttons on screen.
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins.set(WindowPlugin {
|
|
primary_window: Some(Window {
|
|
present_mode: PresentMode::Immediate,
|
|
..default()
|
|
}),
|
|
..default()
|
|
}))
|
|
.add_plugin(FrameTimeDiagnosticsPlugin::default())
|
|
.add_plugin(LogDiagnosticsPlugin::default())
|
|
.init_resource::<UiFont>()
|
|
.add_startup_system(setup)
|
|
.add_system(button_system)
|
|
.run();
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct IdleColor(BackgroundColor);
|
|
|
|
fn button_system(
|
|
mut interaction_query: Query<
|
|
(&Interaction, &mut BackgroundColor, &IdleColor),
|
|
Changed<Interaction>,
|
|
>,
|
|
) {
|
|
for (interaction, mut material, IdleColor(idle_color)) in interaction_query.iter_mut() {
|
|
if matches!(interaction, Interaction::Hovered) {
|
|
*material = Color::ORANGE_RED.into();
|
|
} else {
|
|
*material = *idle_color;
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Resource)]
|
|
struct UiFont(Handle<Font>);
|
|
|
|
impl FromWorld for UiFont {
|
|
fn from_world(world: &mut World) -> Self {
|
|
let asset_server = world.resource::<AssetServer>();
|
|
UiFont(asset_server.load("fonts/FiraSans-Bold.ttf"))
|
|
}
|
|
}
|
|
|
|
fn setup(mut commands: Commands, font: Res<UiFont>) {
|
|
let count = ROW_COLUMN_COUNT;
|
|
let count_f = count as f32;
|
|
let as_rainbow = |i: usize| Color::hsl((i as f32 / count_f) * 360.0, 0.9, 0.8);
|
|
commands.spawn(Camera2dBundle::default());
|
|
commands
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
size: Size::new(Val::Percent(100.0), Val::Percent(100.0)),
|
|
..default()
|
|
},
|
|
..default()
|
|
})
|
|
.with_children(|commands| {
|
|
for i in 0..count {
|
|
for j in 0..count {
|
|
let color = as_rainbow(j % i.max(1)).into();
|
|
spawn_button(commands, font.0.clone_weak(), color, count_f, i, j);
|
|
}
|
|
}
|
|
});
|
|
}
|
|
fn spawn_button(
|
|
commands: &mut ChildBuilder,
|
|
font: Handle<Font>,
|
|
color: BackgroundColor,
|
|
total: f32,
|
|
i: usize,
|
|
j: usize,
|
|
) {
|
|
let width = 90.0 / total;
|
|
commands
|
|
.spawn((
|
|
ButtonBundle {
|
|
style: Style {
|
|
size: Size::new(Val::Percent(width), Val::Percent(width)),
|
|
|
|
position: UiRect {
|
|
bottom: Val::Percent(100.0 / total * i as f32),
|
|
left: Val::Percent(100.0 / total * j as f32),
|
|
..default()
|
|
},
|
|
align_items: AlignItems::Center,
|
|
position_type: PositionType::Absolute,
|
|
..default()
|
|
},
|
|
background_color: color,
|
|
..default()
|
|
},
|
|
IdleColor(color),
|
|
))
|
|
.with_children(|commands| {
|
|
commands.spawn(TextBundle::from_section(
|
|
format!("{i}, {j}"),
|
|
TextStyle {
|
|
font,
|
|
font_size: FONT_SIZE,
|
|
color: Color::rgb(0.2, 0.2, 0.2),
|
|
},
|
|
));
|
|
});
|
|
}
|