assets/monologues/a.monologue.txt

@@ -1,10 +0,0 @@
-Voluptatem culpa quo quia alias minima amet. Consequatur fugit et vitae qui dolor. Aut ea dolorum dicta quas ex et recusandae et. Nostrum eos quia quis est consequuntur.
-
-Ratione facilis aliquid et. Dolores expedita magni suscipit minima. Voluptatem in pariatur vitae laboriosam aliquam non ducimus. Laudantium illum provident et libero assumenda et sunt similique. Corporis tenetur repellat enim perferendis ut minus omnis.
-
-Blanditiis vitae quae ut ipsum consequatur. Ratione dignissimos exercitationem autem accusamus. Qui molestiae ipsam pariatur quis amet quia voluptate sunt. In voluptate dolorum in quia. Sit ut non voluptatem qui placeat quis. Ducimus ipsa adipisci eligendi dolor id.
-
-Ex totam nam laudantium quis. Omnis saepe mollitia eligendi unde rerum. Odit voluptatum repellat rem est iure neque saepe.
-
-Nulla est consequatur sint amet nesciunt quam. Qui fuga excepturi veritatis quia. Saepe natus et enim eveniet voluptates velit quod sint. Dolores reprehenderit eligendi aut. Et voluptate ea aliquam.
-

assets/monologues/b.monologue.txt

@@ -1 +0,0 @@
-This is a placeholder monologue

src/ui.rs

@@ -31,10 +31,10 @@ impl Plugin for GameUiPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<Alert>()
             .add_systems(Startup, init_alerts)
-            .add_systems(PreUpdate, create_titles)
             .add_systems(
                 Update,
                 (
+                    create_titles,
                     manage_titles,
                     manage_button_interaction,
                     manage_select_active,
@@ -55,39 +55,9 @@ pub use title::*;
 mod title {
     use super::*;
 
-    #[derive(Debug, Component, Default)]
+    #[derive(Debug, Component)]
     pub struct Title {
         pub text: String,
-        pub font: Option<Handle<Font>>,
-    }
-
-    #[derive(Debug)]
-    pub struct TitleBarBase {
-        bg_color: Color,
-    }
-
-    impl TitleBarBase {
-        pub fn new(bg_color: Color) -> Self {
-            Self { bg_color }
-        }
-
-        pub fn bundle(&self) -> NodeBundle {
-            NodeBundle {
-                style: Style {
-                    padding: UiRect::all(Val::Px(1.0)),
-                    margin: UiRect::all(Val::Px(1.0)),
-                    border: UiRect::all(Val::Px(1.0)),
-                    flex_direction: FlexDirection::Row,
-                    align_items: AlignItems::Center,
-                    align_content: AlignContent::Center,
-                    justify_content: JustifyContent::SpaceBetween,
-                    ..default()
-                },
-                background_color: self.bg_color.into(),
-                border_color: Color::BLACK.into(),
-                ..default()
-            }
-        }
     }
 
     #[derive(Debug, Component)]
@@ -123,24 +93,16 @@ mod title {
     ) {
         events.for_each(|(entity, title, note, minimize, close)| {
             commands.entity(entity).with_children(|parent| {
-                let style = match &title.font {
-                    Some(handle) => TextStyle {
-                        color: Color::BLACK,
-                        font: handle.clone(),
-                        ..default()
-                    },
-                    None => TextStyle {
-                        color: Color::BLACK,
-                        ..default()
-                    },
-                };
                 parent.spawn((
                     TextBundle {
                         text: Text {
                             sections: vec![
                                 TextSection {
                                     value: title.text.clone(),
-                                    style,
+                                    style: TextStyle {
+                                        color: Color::BLACK,
+                                        ..default()
+                                    },
                                 },
                                 TextSection {
                                     value: note
@@ -329,19 +291,19 @@ mod collapse {
         collapses: Query<&Collapse, With<Button>>,
         mut styles: Query<&mut Style>,
     ) {
-        // Removed collapse, hide the target entity
+        // Added collapse, display the target entity
-        removed.iter().for_each(|e| {
+        added.iter().for_each(|e| {
             if let Ok(Collapse { target }) = collapses.get(e) {
                 if let Ok(mut style) = styles.get_mut(*target) {
-                    style.display = Display::None;
+                    style.display = Display::Flex;
                 }
             }
         });
-        // Added collapse, display the target entity
+        // Removed collapse, hide the target entity
-        added.iter().for_each(|e| {
+        removed.iter().for_each(|e| {
             if let Ok(Collapse { target }) = collapses.get(e) {
                 if let Ok(mut style) = styles.get_mut(*target) {
-                    style.display = Display::Flex;
+                    style.display = Display::None;
                 }
             }
         });
@@ -390,14 +352,14 @@ mod buttons {
         mut removed_active: RemovedComponents<Active>,
         mut bg_colors: Query<&mut BackgroundColor>,
     ) {
-        removed_active.iter().for_each(|e| {
+        added_active.for_each(|e| {
             if let Ok(mut bg_color) = bg_colors.get_mut(e) {
-                *bg_color = Color::WHITE.into();
+                *bg_color = Color::ORANGE.into();
             }
         });
-        added_active.for_each(|e| {
+        removed_active.iter().for_each(|e| {
             if let Ok(mut bg_color) = bg_colors.get_mut(e) {
-                *bg_color = Color::ORANGE.into();
+                *bg_color = Color::WHITE.into();
             }
         });
         events.for_each(|(entity, interaction, active)| {
@@ -608,43 +570,36 @@ pub mod alert {
                             justify_self: JustifySelf::Center,
                             ..default()
                         },
-                        background_color: Color::WHITE.into(),
                         border_color: color.into(),
                         ..default()
                     })
                     .with_children(|parent| {
                         parent.spawn((
-                            TitleBarBase::new(color).bundle(),
+                            NodeBundle {
+                                style: Style {
+                                    padding: UiRect::all(Val::Px(1.0)),
+                                    margin: UiRect::all(Val::Px(1.0)),
+                                    border: UiRect::all(Val::Px(1.0)),
+                                    flex_direction: FlexDirection::Row,
+                                    align_items: AlignItems::Center,
+                                    align_content: AlignContent::Center,
+                                    justify_content: JustifyContent::SpaceBetween,
+                                    ..default()
+                                },
+                                background_color: color.into(),
+                                ..default()
+                            },
                             Title {
                                 text: "Alert".into(),
-                                ..default()
                             },
                             Close {
                                 target: parent.parent_entity(),
                             },
                             Sorting(0),
                         ));
-                        parent.spawn(TextBundle::from_section(
+                        parent.spawn(TextBundle::from_section(text, TextStyle { ..default() }));
-                            text,
-                            TextStyle {
-                                color: Color::BLACK.into(),
-                                ..default()
-                            },
-                        ));
                     });
             });
         });
     }
 }
-
-use dragndrop::*;
-pub mod dragndrop {
-    use super::*;
-
-    #[derive(Debug, Component)]
-    struct DragNDrop;
-
-    pub fn dragndrop() {
-        todo!()
-    }
-}