SimpleTextInput- use offical repo with my fix

beamable · Feb 19, 2024 · 6e67d31 · 6e67d31
1 parent c91b170
commit 6e67d31
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/bevy_forge/Cargo.lock b/bevy_forge/Cargo.lock
diff --git a/bevy_forge/Cargo.toml b/bevy_forge/Cargo.toml
@@ -29,7 +29,7 @@ serde_json = "1.0"
 futures-lite = "2.2.0"
 bevy_pkv = "0.9.1"
 bevy_button_released_plugin = "0.3.1"
-bevy_simple_text_input =  {git="https://github.com/Leinnan/bevy_simple_text_input"}
+bevy_simple_text_input =  {git="https://github.com/rparrett/bevy_simple_text_input", rev="79663893770a090c6b85f8f41d9a6bba4166fe8e"}
 bevy_args = "1.2.0"
 clap = { version = "4.4", features = ["derive"] }
 

diff --git a/bevy_forge/src/states/init.rs b/bevy_forge/src/states/init.rs
@@ -71,7 +71,7 @@ fn setup(
                         },
                     )
                     .with_text_alignment(TextAlignment::Center),
-                )
+                ).insert(Name::new("GameLogo"))
                 .insert(GameLogoText);
         });
 }
diff --git a/bevy_forge/src/states/login_screen.rs b/bevy_forge/src/states/login_screen.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use bevy_button_released_plugin::ButtonReleasedEvent;
-use bevy_simple_text_input::TextStorage;
+use bevy_simple_text_input::TextInput;
 
 use crate::{
     beam::context::{BeamContext, CreateAnononymousUserEvent},
@@ -36,12 +36,12 @@ fn handle_buttons(
     mut reader: EventReader<ButtonReleasedEvent>,
     mut ev: EventWriter<CreateAnononymousUserEvent>,
     q: Query<&LoginScreenButton>,
-    text: Query<&TextStorage, Changed<TextStorage>>,
+    text: Query<&TextInput, Changed<TextInput>>,
     mut beam: ResMut<BeamContext>,
 ) {
     if let Ok(text) = text.get_single() {
         if !text.0.is_empty() {
-            beam.name = Some((**text).clone());
+            beam.name = Some(text.0.clone());
         }
     }
     for event in reader.read() {
@@ -117,15 +117,5 @@ fn setup(
                         .with_text_alignment(TextAlignment::Center),
                 );
             });
-        // parent.spawn(ImageBundle {
-        //     image: UiImage::new(asset_server.load("gfx/gameIconTransparent.png")),
-        //     ..default()
-        // });
-        // parent
-        //     .spawn(
-        //         TextBundle::from_section("Hi! Request will start soon.", text_style.clone())
-        //             .with_text_alignment(TextAlignment::Center),
-        //     )
-        //     .insert(RequestText);
     });
 }