From 327e4b273979e309b15f04aeaa0f81fc53113f4a Mon Sep 17 00:00:00 2001 From: Amatsugu Date: Sat, 4 Jan 2025 14:28:54 -0500 Subject: [PATCH] ui layout testing --- game/main/src/ui/game/build_ui.rs | 39 ++++++++++++++++++++++++---- game/main/src/utlis/editor_plugin.rs | 12 ++++----- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/game/main/src/ui/game/build_ui.rs b/game/main/src/ui/game/build_ui.rs index 2adede1..35d95f0 100644 --- a/game/main/src/ui/game/build_ui.rs +++ b/game/main/src/ui/game/build_ui.rs @@ -1,4 +1,4 @@ -use bevy::prelude::*; +use bevy::{prelude::*, sprite::Anchor}; use bevy_lunex::prelude::*; pub struct BuildUiPlugin; @@ -22,13 +22,42 @@ fn setup_ui(mut commands: Commands, assets: Res, mut material: ResM .with_children(|ui| { ui.spawn(( UiLink::::path("Root"), - UiLayout::boundary().pos1(Rl(20.0)).pos2(Rl(80.0)).pack::(), + UiLayout::boundary() + .pos1((Rl(0.), Rl(0.))) + .pos2((Rl(100.), Rl(100.))) + .pack::(), )); ui.spawn(( - UiLink::::path("Root/Rect"), - UiLayout::solid().size((Ab(1920.0), Ab(1080.0))).pack::(), - UiImage2dBundle::from(assets.load("textures/world/test2.png")), + UiLink::::path("Root/MainRect"), + UiLayout::window() + .anchor(Anchor::BottomCenter) + .size((Ab(800.), Rl(100.))) + .pos((Rl(50.), Rl(100.))) + .pack::(), )); + + ui.spawn(( + UiLink::::path("Root/MainRect/Categories"), + UiLayout::solid() + .align_y(Align::END) + .size((Rl(100.), Ab(30.))) + .pack::(), + )); + + for i in 1..5 { + let path = format!("Root/MainRect/Categories/Button{}", i); + ui.spawn(( + UiLink::::path(path), + UiLayout::div() + .margin_x(Ab(5.)) + .height(Sizing::Max) + .min_height(Ab(30.)) + .min_width(Sp(10.)) + .max_width(Sp(100.)) + .pack::(), + UiImage2dBundle::from(assets.load("textures/world/test2.png")), + )); + } }); } diff --git a/game/main/src/utlis/editor_plugin.rs b/game/main/src/utlis/editor_plugin.rs index 3b04561..28313d0 100644 --- a/game/main/src/utlis/editor_plugin.rs +++ b/game/main/src/utlis/editor_plugin.rs @@ -14,11 +14,11 @@ impl Plugin for EditorPlugin { fn build(&self, app: &mut App) { app.init_resource::(); - app.add_systems(PostUpdate, prepare_image.run_if(in_state(GeneratorState::SpawnMap))); - app.add_systems( - Update, - (render_map_ui, update_map_render, asset_reloaded).run_if(in_state(GeneratorState::Idle)), - ); + // app.add_systems(PostUpdate, prepare_image.run_if(in_state(GeneratorState::SpawnMap))); + // app.add_systems( + // Update, + // (render_map_ui, update_map_render, asset_reloaded).run_if(in_state(GeneratorState::Idle)), + // ); } } @@ -69,7 +69,7 @@ fn asset_reloaded( let mut rebuild = false; for event in asset_events.read() { match event { - AssetEvent::Modified {..}=> rebuild = true, + AssetEvent::Modified { .. } => rebuild = true, _ => (), } }