From e4ef8e8fca53c1ccff1a675d79dec8c9237f0d30 Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Wed, 30 Aug 2023 23:06:57 +0100 Subject: [PATCH] Fix a bunch of examples --- examples/ecs/apply_deferred.rs | 1 + examples/ecs/state.rs | 1 + examples/games/game_menu.rs | 4 ++++ examples/stress_tests/many_buttons.rs | 1 + examples/stress_tests/many_glyphs.rs | 2 +- examples/ui/borders.rs | 3 +-- examples/ui/button.rs | 1 + examples/ui/display_and_visibility.rs | 6 ++---- examples/ui/overflow.rs | 3 ++- examples/ui/size_constraints.rs | 3 ++- examples/ui/text_wrap_debug.rs | 3 ++- examples/ui/transparency_ui.rs | 1 + examples/ui/ui_texture_atlas.rs | 3 ++- examples/ui/z_index.rs | 1 + examples/window/scale_factor_override.rs | 1 + 15 files changed, 23 insertions(+), 11 deletions(-) diff --git a/examples/ecs/apply_deferred.rs b/examples/ecs/apply_deferred.rs index e9944e497ffd9f..a8ffaad2bb853a 100644 --- a/examples/ecs/apply_deferred.rs +++ b/examples/ecs/apply_deferred.rs @@ -70,6 +70,7 @@ fn setup(mut commands: Commands) { .spawn(NodeBundle { style: Style { width: Val::Percent(100.0), + height: Val::Percent(100.0), align_items: AlignItems::Center, justify_content: JustifyContent::Center, flex_direction: FlexDirection::Column, diff --git a/examples/ecs/state.rs b/examples/ecs/state.rs index 31c0346206bdbf..c4603196f461b8 100644 --- a/examples/ecs/state.rs +++ b/examples/ecs/state.rs @@ -54,6 +54,7 @@ fn setup_menu(mut commands: Commands) { style: Style { // center button width: Val::Percent(100.), + height: Val::Percent(100.), justify_content: JustifyContent::Center, align_items: AlignItems::Center, ..default() diff --git a/examples/games/game_menu.rs b/examples/games/game_menu.rs index 0f40483052db9e..c6ee0a6e52e2a4 100644 --- a/examples/games/game_menu.rs +++ b/examples/games/game_menu.rs @@ -423,6 +423,7 @@ mod menu { NodeBundle { style: Style { width: Val::Percent(100.0), + height: Val::Percent(100.0), align_items: AlignItems::Center, justify_content: JustifyContent::Center, ..default() @@ -548,6 +549,7 @@ mod menu { NodeBundle { style: Style { width: Val::Percent(100.0), + height: Val::Percent(100.0), align_items: AlignItems::Center, justify_content: JustifyContent::Center, ..default() @@ -613,6 +615,7 @@ mod menu { NodeBundle { style: Style { width: Val::Percent(100.0), + height: Val::Percent(100.0), align_items: AlignItems::Center, justify_content: JustifyContent::Center, ..default() @@ -716,6 +719,7 @@ mod menu { NodeBundle { style: Style { width: Val::Percent(100.0), + height: Val::Percent(100.0), align_items: AlignItems::Center, justify_content: JustifyContent::Center, ..default() diff --git a/examples/stress_tests/many_buttons.rs b/examples/stress_tests/many_buttons.rs index 1095076e16fc6b..d7c8533c37a07a 100644 --- a/examples/stress_tests/many_buttons.rs +++ b/examples/stress_tests/many_buttons.rs @@ -120,6 +120,7 @@ fn setup_flex(mut commands: Commands, asset_server: Res, args: Res< justify_content: JustifyContent::Center, align_items: AlignItems::Center, width: Val::Percent(100.), + height: Val::Percent(100.), ..default() }, ..default() diff --git a/examples/stress_tests/many_glyphs.rs b/examples/stress_tests/many_glyphs.rs index 0b095c170bee7d..398ac3cb64f9b7 100644 --- a/examples/stress_tests/many_glyphs.rs +++ b/examples/stress_tests/many_glyphs.rs @@ -54,7 +54,7 @@ fn setup(mut commands: Commands) { commands .spawn(NodeBundle { style: Style { - flex_basis: Val::Percent(100.), + width: Val::Percent(100.), align_items: AlignItems::Center, justify_content: JustifyContent::Center, ..default() diff --git a/examples/ui/borders.rs b/examples/ui/borders.rs index bf6cac544ce75f..56d18827c583f1 100644 --- a/examples/ui/borders.rs +++ b/examples/ui/borders.rs @@ -14,8 +14,7 @@ fn setup(mut commands: Commands) { let root = commands .spawn(NodeBundle { style: Style { - flex_basis: Val::Percent(100.0), - margin: UiRect::all(Val::Px(25.0)), + width: Val::Percent(100.0), flex_wrap: FlexWrap::Wrap, justify_content: JustifyContent::FlexStart, align_items: AlignItems::FlexStart, diff --git a/examples/ui/button.rs b/examples/ui/button.rs index fef128f6f8c572..27ab4a19a12d59 100644 --- a/examples/ui/button.rs +++ b/examples/ui/button.rs @@ -58,6 +58,7 @@ fn setup(mut commands: Commands, asset_server: Res) { .spawn(NodeBundle { style: Style { width: Val::Percent(100.0), + height: Val::Percent(100.0), align_items: AlignItems::Center, justify_content: JustifyContent::Center, ..default() diff --git a/examples/ui/display_and_visibility.rs b/examples/ui/display_and_visibility.rs index 370ad677b85f98..55810a84b4fc6d 100644 --- a/examples/ui/display_and_visibility.rs +++ b/examples/ui/display_and_visibility.rs @@ -82,8 +82,9 @@ fn setup(mut commands: Commands, asset_server: Res) { commands.spawn(Camera2dBundle::default()); commands.spawn(NodeBundle { style: Style { + width: Val::Percent(100.), + height: Val::Percent(100.), flex_direction: FlexDirection::Column, - flex_basis: Val::Percent(100.), align_items: AlignItems::Center, justify_content: JustifyContent::SpaceEvenly, ..Default::default() @@ -189,9 +190,6 @@ fn spawn_left_panel(builder: &mut ChildBuilder, palette: &[Color; 4]) -> Vec) { commands .spawn(NodeBundle { style: Style { + width: Val::Percent(100.), + height: Val::Percent(100.), align_items: AlignItems::Center, justify_content: JustifyContent::Center, - width: Val::Percent(100.), ..Default::default() }, background_color: Color::ANTIQUE_WHITE.into(), diff --git a/examples/ui/size_constraints.rs b/examples/ui/size_constraints.rs index 5f0892c14afa81..72daae989dee38 100644 --- a/examples/ui/size_constraints.rs +++ b/examples/ui/size_constraints.rs @@ -51,7 +51,8 @@ fn setup(mut commands: Commands, asset_server: Res) { commands .spawn(NodeBundle { style: Style { - flex_basis: Val::Percent(100.0), + width: Val::Percent(100.0), + height: Val::Percent(100.0), justify_content: JustifyContent::Center, align_items: AlignItems::Center, ..Default::default() diff --git a/examples/ui/text_wrap_debug.rs b/examples/ui/text_wrap_debug.rs index 374799ec8189ab..a7d01e3ab8e1e1 100644 --- a/examples/ui/text_wrap_debug.rs +++ b/examples/ui/text_wrap_debug.rs @@ -24,8 +24,9 @@ fn spawn(mut commands: Commands, asset_server: Res) { let root = commands .spawn(NodeBundle { style: Style { - flex_direction: FlexDirection::Column, width: Val::Percent(100.), + height: Val::Percent(100.), + flex_direction: FlexDirection::Column, ..Default::default() }, background_color: Color::BLACK.into(), diff --git a/examples/ui/transparency_ui.rs b/examples/ui/transparency_ui.rs index 2a6fe7f9b93d4f..2aabe43dc85d0e 100644 --- a/examples/ui/transparency_ui.rs +++ b/examples/ui/transparency_ui.rs @@ -20,6 +20,7 @@ fn setup(mut commands: Commands, asset_server: Res) { .spawn(NodeBundle { style: Style { width: Val::Percent(100.0), + height: Val::Percent(100.0), align_items: AlignItems::Center, justify_content: JustifyContent::SpaceAround, ..default() diff --git a/examples/ui/ui_texture_atlas.rs b/examples/ui/ui_texture_atlas.rs index d6b16ce38af0fb..8609288bf790a3 100644 --- a/examples/ui/ui_texture_atlas.rs +++ b/examples/ui/ui_texture_atlas.rs @@ -40,8 +40,9 @@ fn setup( commands .spawn(NodeBundle { style: Style { - flex_direction: FlexDirection::Column, width: Val::Percent(100.0), + height: Val::Percent(100.0), + flex_direction: FlexDirection::Column, justify_content: JustifyContent::Center, align_items: AlignItems::Center, row_gap: Val::Px(text_style.font_size * 2.), diff --git a/examples/ui/z_index.rs b/examples/ui/z_index.rs index f6eae5fe5c124e..0580391018846a 100644 --- a/examples/ui/z_index.rs +++ b/examples/ui/z_index.rs @@ -23,6 +23,7 @@ fn setup(mut commands: Commands) { .spawn(NodeBundle { style: Style { width: Val::Percent(100.), + height: Val::Percent(100.), align_items: AlignItems::Center, justify_content: JustifyContent::Center, ..default() diff --git a/examples/window/scale_factor_override.rs b/examples/window/scale_factor_override.rs index a465432c000ac6..bfa74cfe116dd0 100644 --- a/examples/window/scale_factor_override.rs +++ b/examples/window/scale_factor_override.rs @@ -28,6 +28,7 @@ fn setup(mut commands: Commands) { .spawn(NodeBundle { style: Style { width: Val::Percent(100.0), + height: Val::Percent(100.0), justify_content: JustifyContent::SpaceBetween, ..default() },