From 22dea213aabb0d0f98560ffaa0731c92089a58af Mon Sep 17 00:00:00 2001 From: Matthew Ryan Dillon Date: Sun, 25 Aug 2024 15:37:24 -0400 Subject: [PATCH] remove output text concept, instead make it clear what text is being operated on --- src/main.rs | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/src/main.rs b/src/main.rs index d32becc..56f642f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,11 +15,6 @@ struct InputText { value: String, } -#[derive(Resource, Debug)] -struct OutputText { - value: String, -} - #[derive(Resource, Debug)] struct NeedsSort { value: bool, @@ -36,9 +31,6 @@ fn main() { .insert_resource(InputText { value: "".to_string(), }) - .insert_resource(OutputText { - value: "".to_string(), - }) .insert_resource(NeedsSort { value: false }) .insert_resource(NeedsStrip { value: false }) .add_plugins(DefaultPlugins.set(WindowPlugin { @@ -55,10 +47,9 @@ fn main() { } fn process_text( - mut output_text: ResMut, mut needs_sort: ResMut, mut needs_strip: ResMut, - input_text: Res, + mut input_text: ResMut, ) { let needs_processing = needs_sort.value || needs_strip.value; @@ -75,7 +66,7 @@ fn process_text( needs_sort.value = false; } - output_text.value = arr.join(LINE_ENDING); + input_text.value = arr.join(LINE_ENDING); } } @@ -84,7 +75,6 @@ fn ui_system( mut input_text: ResMut, mut needs_sort: ResMut, mut needs_strip: ResMut, - output_text: Res, ) { contexts.ctx_mut().set_visuals(egui::Visuals::light()); @@ -106,13 +96,12 @@ fn ui_system( let copy_button = ui.button("Copy"); if copy_button.clicked() { - ui.output_mut(|o| o.copied_text = output_text.value.clone()); + ui.output_mut(|o| o.copied_text = input_text.value.clone()); } let clear_button = ui.button("Clear"); if clear_button.clicked() { input_text.value = "".to_string(); - needs_sort.value = true; } }); @@ -123,21 +112,10 @@ fn ui_system( .id_source("left") .show(ui, |ui| { ui.add_sized( - [ui.available_width() / 2., height], + [ui.available_width(), height], egui::TextEdit::multiline(&mut input_text.value), ); }); - - egui::ScrollArea::vertical() - .id_source("right") - .show(ui, |ui| { - ui.with_layout( - egui::Layout::top_down_justified(egui::Align::LEFT), - |ui| { - ui.add(egui::Label::new(&output_text.value).selectable(true)); - }, - ) - }); }, ); });