Restructuring

Benji377 · Jan 19, 2025 · 2c35401 · 2c35401
1 parent 413842c
commit 2c35401
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/editor/editor.rs → src/editor.rs b/src/editor/editor.rs → src/editor.rs
@@ -85,7 +85,7 @@ impl Editor {
                     load_file(document_dir_pathbuf),
                     Message::FileOpened,
                 ),
-                iced::window::get_latest().map(|id| Message::InitWindow(id)),
+                iced::window::get_latest().map(Message::InitWindow),
                 widget::focus_next(),
 
             ]),

diff --git a/src/editor/mod.rs b/src/editor/mod.rs
diff --git a/src/main.rs b/src/main.rs
@@ -2,10 +2,12 @@ use global_hotkey::hotkey::{Code, HotKey, Modifiers};
 use iced::Font;
 use log::LevelFilter;
 use simplelog::TermLogger;
-use editor::editor::Editor;
 use std::sync::LazyLock;
 
 mod editor;
+use editor::Editor;
+//mod settings;
+//use settings::Settings;
 
 static APP_NAME: &str = "SlightlyBetterText";
 static LOGO: &[u8] = include_bytes!("assets/logo.ico");
@@ -32,9 +34,11 @@ pub fn main() -> iced::Result {
         simplelog::ColorChoice::Auto,
     ).expect("Failed to initialize logger");
 
-    let mut window_settings = iced::window::Settings::default();
-    window_settings.visible = true;
-    window_settings.icon = Some(iced::window::icon::from_file_data(LOGO, None).expect("Failed to load icon"));
+    let window_settings = iced::window::Settings {
+        visible: true,
+        icon: Some(iced::window::icon::from_file_data(LOGO, None).expect("Failed to load icon")),
+        ..iced::window::Settings::default()
+    };
 
     iced::application(APP_NAME, Editor::update, Editor::view)
         .subscription(Editor::subscription)

diff --git a/src/editor/settings.rs → src/settings.rs b/src/editor/settings.rs → src/settings.rs