move gui options somewhere more reasonable

Author: onsdagens

src/gui_egui/gui.rs

@@ -2,6 +2,7 @@ use crate::common::{ComponentStore, Components, Simulator};
 use crate::gui_egui::editor::EditorMode;
 use crate::gui_egui::{
     editor::{Editor, Library},
+    gui_options::GuiOptions,
     keymap,
     keymap::Shortcuts,
     menu::Menu,
@@ -38,22 +39,6 @@ pub struct Gui {
     pub gui_options: GuiOptions,
 }
 
-#[derive(Clone, Debug)]
-pub struct GuiOptions {
-    // This is added/subtracted to/from the view scale when zoomed.
-    pub view_scaling_val: f32,
-    pub window_visible: bool,
-}
-
-impl Default for GuiOptions {
-    fn default() -> GuiOptions {
-        GuiOptions {
-            view_scaling_val: 0.03,
-            window_visible: false,
-        }
-    }
-}
-
 #[derive(Clone, Debug)]
 pub struct EguiExtra {
     pub properties_window: bool,
@@ -92,12 +77,16 @@ pub fn gui(cs: ComponentStore, path: &PathBuf, library: Library) -> Result<(), e
 }
 
 impl Gui {
-    pub fn new(cs: ComponentStore, path: &PathBuf, library: Library) -> Result<Self, Box<dyn Error>> {
+    pub fn new(
+        cs: ComponentStore,
+        path: &PathBuf,
+        library: Library,
+    ) -> Result<Self, Box<dyn Error>> {
         let contexts = create_contexts(&cs.store);
         let simulator = Simulator::new(cs)?;
         let path = path.to_owned();
         // simulator.save_dot(&path);
-        
+
         Ok(Gui {
             path,
             simulator: Some(simulator),
@@ -256,30 +245,3 @@ pub fn create_contexts(components: &Components) -> HashMap<crate::common::Id, Eg
     }
     contexts
 }
-
-
-use egui::{ViewportBuilder, ViewportId};
-/// This should be somewhere else but put it here for experiments
-// It makes more sense to have a GuiOptionsWindow having render but let's see how this works
-impl GuiOptions {
-    pub fn render(&mut self, ctx: &egui::Context) {
-        ctx.show_viewport_immediate(
-            ViewportId::from_hash_of("Preferences"),
-            ViewportBuilder {
-                title: Some("Preferences".to_string()),
-                position: Some(Pos2::new(ctx.screen_rect().max.x/2.0, ctx.screen_rect().max.y/2.0)),
-                inner_size: Some((500.0, 200.0).into()),
-                ..ViewportBuilder::default()
-            },
-            |ctx, _class| {
-                if ctx.input(|i| i.viewport().close_requested()) {
-                    self.window_visible = false
-                }
-                egui::CentralPanel::default().show(ctx, |ui| {
-                    ui.label("Zoom Scaling");
-                    let response = ui.add(egui::Slider::new(&mut self.view_scaling_val, 0.0..=0.1));
-                    response.on_hover_text("Adjusts the step size by which zooming zooms.");
-                });
-        });
-    }
-}

src/gui_egui/gui_options.rs

@@ -0,0 +1,44 @@
+use egui::{ViewportBuilder, ViewportId, Pos2};
+
+#[derive(Clone, Debug)]
+pub struct GuiOptions {
+    // This is added/subtracted to/from the view scale when zoomed.
+    pub view_scaling_val: f32,
+    pub window_visible: bool,
+}
+
+impl Default for GuiOptions {
+    fn default() -> GuiOptions {
+        GuiOptions {
+            view_scaling_val: 0.03,
+            window_visible: false,
+        }
+    }
+}
+
+
+impl GuiOptions {
+    // Naming would make more sense if it was a GuiOptionsWindow being rendered, then again i see
+    // no point in adding more structs for the sake of naming (maybe the point will become apparent
+    // down the line).
+    pub fn render(&mut self, ctx: &egui::Context) {
+        ctx.show_viewport_immediate(
+            ViewportId::from_hash_of("Preferences"),
+            ViewportBuilder {
+                title: Some("Preferences".to_string()),
+                position: Some(Pos2::new(ctx.screen_rect().max.x/2.0, ctx.screen_rect().max.y/2.0)),
+                inner_size: Some((500.0, 200.0).into()),
+                ..ViewportBuilder::default()
+            },
+            |ctx, _class| {
+                if ctx.input(|i| i.viewport().close_requested()) {
+                    self.window_visible = false
+                }
+                egui::CentralPanel::default().show(ctx, |ui| {
+                    ui.label("Zoom Scaling");
+                    let response = ui.add(egui::Slider::new(&mut self.view_scaling_val, 0.0..=0.1));
+                    response.on_hover_text("Adjusts the step size by which zooming zooms.");
+                });
+        });
+    }
+}

src/gui_egui/mod.rs

@@ -6,7 +6,7 @@ pub mod helper;
 mod keymap;
 mod library;
 mod menu;
-
+mod gui_options;
 #[cfg(feature = "components")]
 pub mod components;