From 0129f1e41d4b9337d5c87d4b6baca051e6686af8 Mon Sep 17 00:00:00 2001
From: Elijah Voigt <elijah.caine.mv@gmail.com>
Date: Sun, 27 Aug 2023 12:29:11 -0700
Subject: [PATCH] Preview still works... not sure what I was working on...

---
 assets/monologues/a.monologue.txt | 11 +++++++-
 bin/editor.rs                     | 43 ++++++++++++++++++++-----------
 src/ui.rs                         | 22 ++++++++--------
 3 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/assets/monologues/a.monologue.txt b/assets/monologues/a.monologue.txt
index 3fdb30d..1e7b6d2 100644
--- a/assets/monologues/a.monologue.txt
+++ b/assets/monologues/a.monologue.txt
@@ -1 +1,10 @@
-This is a placeholder monologue
+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.
+
diff --git a/bin/editor.rs b/bin/editor.rs
index 075a367..7bc86ed 100644
--- a/bin/editor.rs
+++ b/bin/editor.rs
@@ -1,4 +1,4 @@
-// Monologue Trees Editor
+// Monologe Trees Editor
 //
 // Editor for creating Monologue Trees levels
 //
@@ -81,6 +81,7 @@ fn main() {
                 play_animation,
                 play_audio,
                 show_preview_text,
+                sync_monologue_font,
             ),
         )
         .run();
@@ -1054,20 +1055,15 @@ mod monologues {
 
     // TODO(BUG): Better handle hide/close monologue
     pub fn show_preview_text(
-        show: Query<Entity, (With<Button>, Added<ui::Active>)>,
+        added: Query<Entity, (With<Button>, Added<ui::Active>)>,
         mut removed: RemovedComponents<ui::Active>,
         monologue_handles: Query<&ui::TargetAsset<Monologue>>,
         monologues: Res<Assets<Monologue>>,
         container: Query<Entity, With<MonologueContainer>>,
         mut commands: Commands,
     ) {
-        removed
+        added
             .iter()
-            .filter_map(|entity| monologue_handles.get(entity).ok())
-            .for_each(|_| {
-                commands.entity(container.single()).despawn_descendants();
-            });
-        show.iter()
             .filter_map(|entity| monologue_handles.get(entity).ok())
             .for_each(|ui::TargetAsset { handle }| {
                 let monologue = monologues.get(handle).expect("Preview loaded monologue");
@@ -1085,7 +1081,6 @@ mod monologues {
                                     flex_direction: FlexDirection::Column,
                                     ..default()
                                 },
-
                                 background_color: Color::WHITE.into(),
                                 border_color: Color::BLACK.into(),
                                 ..default()
@@ -1115,17 +1110,35 @@ mod monologues {
                                     },
                                     ui::Sorting(0),
                                 ));
-                                parent.spawn(TextBundle::from_section(
-                                    monologue.text.clone(),
-                                    TextStyle {
-                                        color: Color::BLACK.into(),
-                                        ..default()
-                                    },
+                                parent.spawn((
+                                    TextBundle::from_section(
+                                        monologue.text.clone(),
+                                        TextStyle {
+                                            color: Color::BLACK.into(),
+                                            font_size: 16.0,
+                                            ..default()
+                                        },
+                                    ),
+                                    handle.clone(),
                                 ));
                             });
                     });
             })
     }
+
+    // TODO: Sync Handle<Monologue> and TextStyle components to automagically generate and sync text
+    pub fn sync_monologue_font(
+        events: Query<&ui::TargetAsset<Font>, Added<ui::Active>>,
+        mut texts: Query<&mut Text, With<Handle<Monologue>>>,
+    ) {
+        events.iter().for_each(|ui::TargetAsset { handle }| {
+            texts.iter_mut().for_each(|mut text| {
+                text.sections.iter_mut().for_each(|section| {
+                    section.style.font = handle.clone();
+                });
+            });
+        });
+    }
 }
 
 use cameras::*;
diff --git a/src/ui.rs b/src/ui.rs
index 4babd3e..16ae171 100644
--- a/src/ui.rs
+++ b/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,
@@ -300,19 +300,19 @@ mod collapse {
         collapses: Query<&Collapse, With<Button>>,
         mut styles: Query<&mut Style>,
     ) {
-        // Added collapse, display the target entity
-        added.iter().for_each(|e| {
+        // Removed collapse, hide the target entity
+        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;
                 }
             }
         });
-        // Removed collapse, hide the target entity
-        removed.iter().for_each(|e| {
+        // Added collapse, display the target entity
+        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;
                 }
             }
         });
@@ -361,14 +361,14 @@ mod buttons {
         mut removed_active: RemovedComponents<Active>,
         mut bg_colors: Query<&mut BackgroundColor>,
     ) {
-        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();
             }
         });
-        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();
             }
         });
         events.for_each(|(entity, interaction, active)| {