Ability to start the app with --hidden (#517)

ethui · Nov 19, 2023 · 1d9631b · 1d9631b
1 parent f4aae8b
commit 1d9631b
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 32 deletions.
diff --git a/Justfile b/Justfile
@@ -1,3 +1,5 @@
+set positional-arguments
+
 alias d := dev
 alias f := fix
 alias l := lint
@@ -10,8 +12,8 @@ build:
   yarn extension:build
   cargo build
 
-dev:
-  yarn run tauri dev --features ${IRON_FEATURES:-debug}
+dev *args='':
+  yarn run tauri dev --features ${IRON_FEATURES:-debug} -- -- -- $@
 
 fix:
   cargo +nightly fmt --all

diff --git a/bin/iron/src/app.rs b/bin/iron/src/app.rs
@@ -3,11 +3,9 @@ use std::path::PathBuf;
 use iron_args::Args;
 use iron_broadcast::UIMsg;
 use iron_db::DB;
-use iron_settings::Settings;
-use iron_types::GlobalState;
 #[cfg(target_os = "macos")]
 use tauri::WindowEvent;
-use tauri::{AppHandle, Builder, GlobalWindowEvent, Manager, Window, Wry};
+use tauri::{AppHandle, Builder, GlobalWindowEvent, Manager};
 use tauri_plugin_window_state::Builder as windowStatePlugin;
 
 use crate::{
@@ -90,7 +88,10 @@ impl IronApp {
             .expect("error while running tauri application");
 
         init(&app, args).await?;
-        build_main_window(&app).await?;
+
+        if !args.hidden {
+            main_window_show(&app.handle()).await;
+        }
 
         Ok(Self { app })
     }
@@ -136,23 +137,6 @@ async fn init(app: &tauri::App, args: &Args) -> AppResult<()> {
     Ok(())
 }
 
-async fn build_main_window(app: &tauri::App) -> tauri::Result<Window<Wry>> {
-    let onboarded = Settings::read().await.onboarded();
-    let url = if onboarded { "/" } else { "/onboarding" };
-
-    let builder = tauri::WindowBuilder::new(app, "main", tauri::WindowUrl::App(url.into()))
-        .fullscreen(false)
-        .resizable(true)
-        .inner_size(600.0, 800.0);
-
-    #[cfg(target_os = "macos")]
-    let builder = builder
-        .title_bar_style(tauri::TitleBarStyle::Overlay)
-        .hidden_title(true);
-
-    builder.build()
-}
-
 #[cfg(target_os = "macos")]
 fn on_window_event(event: GlobalWindowEvent) {
     if let WindowEvent::CloseRequested { api, .. } = event.event() {
@@ -187,7 +171,7 @@ async fn event_listener(handle: AppHandle) {
                 DialogClose(params) => dialogs::close(&handle, params),
                 DialogSend(params) => dialogs::send(&handle, params),
 
-                MainWindowShow => main_window_show(&handle),
+                MainWindowShow => main_window_show(&handle).await,
                 MainWindowHide => main_window_hide(&handle),
             }
         }

diff --git a/bin/iron/src/system_tray.rs b/bin/iron/src/system_tray.rs
@@ -1,7 +1,5 @@
 use tauri::{AppHandle, Manager, SystemTrayEvent};
 
-use crate::utils::main_window_show;
-
 pub(crate) fn build() -> tauri::SystemTray {
     use tauri::{CustomMenuItem, SystemTray, SystemTrayMenu, SystemTrayMenuItem};
 
@@ -24,10 +22,14 @@ pub(crate) fn event_handler(app: &AppHandle, event: SystemTrayEvent) {
         MenuItemClick { id, .. } => match id.as_str() {
             "quit" => app.exit(0),
             "hide" => app.get_window("main").unwrap().hide().unwrap(),
-            "show" => main_window_show(app),
+            "show" => {
+                tokio::spawn(async { iron_broadcast::main_window_show().await });
+            }
             _ => {}
         },
-        DoubleClick { .. } => main_window_show(app),
+        DoubleClick { .. } => {
+            tokio::spawn(async { iron_broadcast::main_window_show().await });
+        }
         _ => {}
     }
 }
diff --git a/bin/iron/src/utils.rs b/bin/iron/src/utils.rs
@@ -1,12 +1,27 @@
+use iron_settings::Settings;
+use iron_types::GlobalState;
 use tauri::{AppHandle, Manager};
 
-pub(crate) fn main_window_show(app: &AppHandle) {
+pub(crate) async fn main_window_show(app: &AppHandle) {
     if let Some(w) = app.get_window("main") {
         w.show().unwrap()
     } else {
-        tauri::WindowBuilder::new(app, "main", tauri::WindowUrl::App("index.html".into()))
-            .build()
-            .unwrap();
+        let app = app.clone();
+        let onboarded = Settings::read().await.onboarded();
+        let url = if onboarded { "/" } else { "/onboarding" };
+
+        let builder = tauri::WindowBuilder::new(&app, "main", tauri::WindowUrl::App(url.into()))
+            .fullscreen(false)
+            .resizable(true)
+            .visible(false)
+            .inner_size(600.0, 800.0);
+
+        #[cfg(target_os = "macos")]
+        let builder = builder
+            .title_bar_style(tauri::TitleBarStyle::Overlay)
+            .hidden_title(true);
+
+        builder.build().unwrap();
     }
 }
 

diff --git a/crates/args/src/lib.rs b/crates/args/src/lib.rs
@@ -12,4 +12,7 @@ pub struct Args {
 
     #[arg(long, default_value_t = 9002, env = "IRON_WS_PORT")]
     pub ws_port: u16,
+
+    #[arg(long, default_value_t = false)]
+    pub hidden: bool,
 }