diff --git a/crates/border-wars/assets/temp.png b/crates/border-wars/assets/temp.png new file mode 100644 index 0000000..6d174ed Binary files /dev/null and b/crates/border-wars/assets/temp.png differ diff --git a/crates/border-wars/src/map/click_tile.rs b/crates/border-wars/src/map/click_tile.rs index bc2286f..d9238bc 100644 --- a/crates/border-wars/src/map/click_tile.rs +++ b/crates/border-wars/src/map/click_tile.rs @@ -1,6 +1,7 @@ //! All programs related to the clicking on a tile. -use bevy::{input::mouse::MouseButtonInput, prelude::*}; +use bevy::input::mouse::MouseButtonInput; +use bevy::prelude::*; use super::Tile; @@ -44,7 +45,7 @@ fn mouse_handler( ui_scale: Res, ) { let Some(event) = mouse_button_event.read().next() else { - return; + return; }; if !(event.state.is_pressed() && event.button == MouseButton::Left) { diff --git a/crates/border-wars/src/ui/tiles_info.rs b/crates/border-wars/src/ui/tiles_info.rs index 201286e..7a9dcd4 100644 --- a/crates/border-wars/src/ui/tiles_info.rs +++ b/crates/border-wars/src/ui/tiles_info.rs @@ -65,21 +65,38 @@ fn handle_tile_click( transform.translation.y += 10.; } } - } } -fn init_text_zone(mut commands: Commands) { +fn init_text_zone(mut commands: Commands, asset_server: Res) { commands - .spawn(TextBundle { + .spawn(ImageBundle { style: Style { position_type: PositionType::Absolute, + height: Val::Percent(50.), + width: Val::Percent(50.), + bottom: Val::ZERO, + ..Default::default() + }, + image: UiImage { + texture: asset_server.load("temp.png"), ..default() }, ..default() }) - .insert(TileInfoText); + .with_children(|builder| { + builder + .spawn(TextBundle { + style: Style { + height:Val::Percent(100.), + position_type: PositionType::Absolute, + ..default() + }, + ..default() + }) + .insert(TileInfoText); + }); } /// TODO @@ -109,3 +126,14 @@ fn update_tile_info_text( } } } + +// .spawn(TextBundle { +// style: Style { +// position_type: PositionType::Absolute, +// +// ..default() +// }, +// +// ..default() +// }) +// .insert(TileInfoText);