Make lua editor a window rather than a dialog

crumblingstatue · Oct 16, 2024 · e05aa19 · e05aa19
1 parent 4c53e98
commit e05aa19
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 32 deletions.
diff --git a/src/gui/dialogs.rs b/src/gui/dialogs.rs
@@ -1,14 +1,13 @@
 mod auto_save_reload;
 mod jump;
 mod lua_color;
-mod lua_execute;
 mod lua_fill;
 pub mod pattern_fill;
 mod truncate;
 mod x86_asm;
 
 pub use {
     auto_save_reload::AutoSaveReloadDialog, jump::JumpDialog, lua_color::LuaColorDialog,
-    lua_execute::LuaExecuteDialog, lua_fill::LuaFillDialog, pattern_fill::PatternFillDialog,
-    truncate::TruncateDialog, x86_asm::X86AsmDialog,
+    lua_fill::LuaFillDialog, pattern_fill::PatternFillDialog, truncate::TruncateDialog,
+    x86_asm::X86AsmDialog,
 };
diff --git a/src/gui/top_menu/scripting.rs b/src/gui/top_menu/scripting.rs
@@ -1,9 +1,5 @@
 use {
-    crate::{
-        app::App,
-        gui::{dialogs::LuaExecuteDialog, Gui},
-        shell::msg_if_fail,
-    },
+    crate::{app::App, gui::Gui, shell::msg_if_fail},
     mlua::Lua,
 };
 
@@ -16,7 +12,7 @@ pub fn ui(
     line_spacing: u16,
 ) {
     if ui.button("🖹 Lua editor").clicked() {
-        Gui::add_dialog(&mut gui.dialogs, LuaExecuteDialog::default());
+        gui.win.lua_editor.open.toggle();
         ui.close_menu();
     }
     if ui.button("📃 Script manager").clicked() {

diff --git a/src/gui/windows.rs b/src/gui/windows.rs
@@ -16,6 +16,7 @@ use {
     },
     super::Gui,
     crate::app::App,
+    lua_editor::LuaEditorWindow,
 };
 
 mod about;
@@ -28,6 +29,7 @@ mod find_dialog;
 mod find_memory_pointers_window;
 mod layouts_window;
 mod lua_console;
+mod lua_editor;
 mod lua_help;
 mod lua_watch;
 mod meta_diff_window;
@@ -56,6 +58,7 @@ pub struct Windows {
     pub preferences: PreferencesWindow,
     pub about: AboutWindow,
     pub vars: VarsWindow,
+    pub lua_editor: LuaEditorWindow,
     pub lua_help: LuaHelpWindow,
     pub lua_console: LuaConsoleWindow,
     pub lua_watch: Vec<LuaWatchWindow>,
@@ -148,6 +151,7 @@ impl Windows {
             advanced_open,
             external_command,
             preferences,
+            lua_editor,
             lua_help,
             lua_console,
             script_manager,

diff --git a/src/gui/dialogs/lua_execute.rs → src/gui/windows/lua_editor.rs b/src/gui/dialogs/lua_execute.rs → src/gui/windows/lua_editor.rs
@@ -1,7 +1,8 @@
 use {
+    super::{WinCtx, WindowOpen},
     crate::{
         app::App,
-        gui::{Dialog, Gui},
+        gui::Gui,
         meta::{Script, ScriptKey},
         scripting::SCRIPT_ARG_FMT_HELP_STR,
         shell::msg_if_fail,
@@ -14,29 +15,26 @@ use {
     std::time::Instant,
 };
 
-#[derive(Debug, Default)]
-pub struct LuaExecuteDialog {
+#[derive(Default)]
+pub struct LuaEditorWindow {
+    pub open: WindowOpen,
     result_info_string: String,
     err: bool,
     new_script_name: String,
     args_string: String,
     edit_key: Option<ScriptKey>,
 }
 
-impl Dialog for LuaExecuteDialog {
-    fn title(&self) -> &str {
-        "Lua Editor"
-    }
-
-    fn ui(
-        &mut self,
-        ui: &mut egui::Ui,
-        app: &mut App,
-        gui: &mut crate::gui::Gui,
-        lua: &Lua,
-        font_size: u16,
-        line_spacing: u16,
-    ) -> bool {
+impl super::Window for LuaEditorWindow {
+    fn ui(&mut self, ctx: super::WinCtx) {
+        let WinCtx {
+            ui,
+            gui,
+            app,
+            lua,
+            font_size,
+            line_spacing,
+        } = ctx;
         let ctrl_enter =
             ui.input_mut(|inp| inp.consume_key(egui::Modifiers::CTRL, egui::Key::Enter));
         let ctrl_s = ui.input_mut(|inp| inp.consume_key(egui::Modifiers::CTRL, egui::Key::S));
@@ -165,14 +163,14 @@ impl Dialog for LuaExecuteDialog {
                 });
             },
         );
-        true
     }
-    fn has_close_button(&self) -> bool {
-        true
+
+    fn title(&self) -> &str {
+        "Lua Editor"
     }
 }
 
-impl LuaExecuteDialog {
+impl LuaEditorWindow {
     fn exec_lua(
         &mut self,
         app: &mut App,

diff --git a/src/gui/windows/script_manager.rs b/src/gui/windows/script_manager.rs
@@ -2,7 +2,7 @@ use {
     super::{WinCtx, WindowOpen},
     crate::{
         app::App,
-        gui::{dialogs::LuaExecuteDialog, Gui},
+        gui::Gui,
         meta::{ScriptKey, ScriptMap},
         scripting::exec_lua,
         shell::msg_if_fail,
@@ -63,7 +63,7 @@ impl super::Window for ScriptManagerWindow {
             ui.label("There are no saved scripts.");
         }
         if ui.link("Open lua editor").clicked() {
-            Gui::add_dialog(&mut gui.dialogs, LuaExecuteDialog::default());
+            gui.win.lua_editor.open.set(true);
         }
         ui.separator();
         self.selected_script_ui(ui, gui, app, lua, &mut scripts, font_size, line_spacing);