Disable "start meeting" tray item when session is already started (#673)

Author: yujonglee

Cargo.lock

@@ -23,6 +23,7 @@ hypr-listener-interface = { workspace = true }
 tauri-plugin-auth = { workspace = true }
 tauri-plugin-connector = { workspace = true }
 tauri-plugin-db = { workspace = true }
+tauri-plugin-tray = { workspace = true }
 
 hypr-audio = { workspace = true }
 hypr-audio-utils = { workspace = true }

plugins/listener/Cargo.toml

@@ -464,7 +464,11 @@ impl Session {
         }
     }
 
-    #[state(entry_action = "enter_inactive", superstate = "common")]
+    #[state(
+        superstate = "common",
+        entry_action = "enter_inactive",
+        exit_action = "exit_inactive"
+    )]
     async fn inactive(&mut self, event: &StateEvent) -> Response<State> {
         match event {
             StateEvent::Start(id) => match self.setup_resources(id).await {
@@ -484,13 +488,24 @@ impl Session {
 
     #[action]
     async fn enter_inactive(&mut self) {
+        {
+            use tauri_plugin_tray::TrayPluginExt;
+            let _ = self.app.set_start_disabled(false);
+        }
+
         self.teardown_resources().await;
 
         Session::broadcast(&self.channels, SessionEvent::Stopped)
             .await
             .unwrap();
     }
 
+    #[action]
+    async fn exit_inactive(&mut self) {
+        use tauri_plugin_tray::TrayPluginExt;
+        let _ = self.app.set_start_disabled(true);
+    }
+
     fn on_transition(&mut self, source: &State, target: &State) {
         #[cfg(debug_assertions)]
         tracing::info!("transitioned from `{:?}` to `{:?}`", source, target);

plugins/listener/src/fsm.rs

@@ -20,5 +20,3 @@ tauri-plugin-windows = { workspace = true }
 specta = { workspace = true }
 strum = { workspace = true, features = ["derive"] }
 tauri-specta = { workspace = true, features = ["derive", "typescript"] }
-
-webbrowser = "1.0.4"

plugins/tray/Cargo.toml

@@ -5,6 +5,8 @@ use tauri::{
     AppHandle, Result,
 };
 
+const TRAY_ID: &str = "hypr-tray";
+
 pub enum TrayItem {
     Open,
     Start,
@@ -36,6 +38,7 @@ impl From<MenuId> for TrayItem {
 
 pub trait TrayPluginExt<R: tauri::Runtime> {
     fn create_tray(&self) -> Result<()>;
+    fn set_start_disabled(&self, disabled: bool) -> Result<()>;
 }
 
 impl<T: tauri::Manager<tauri::Wry>> TrayPluginExt<tauri::Wry> for T {
@@ -46,13 +49,13 @@ impl<T: tauri::Manager<tauri::Wry>> TrayPluginExt<tauri::Wry> for T {
             app,
             &[
                 &open_menu(app)?,
-                &start_menu(app)?,
+                &start_menu(app, false)?,
                 &PredefinedMenuItem::separator(app)?,
                 &quit_menu(app)?,
             ],
         )?;
 
-        TrayIconBuilder::with_id("hypr-tray")
+        TrayIconBuilder::with_id(TRAY_ID)
             .icon(Image::from_bytes(include_bytes!(
                 "../icons/tray_default.png"
             ))?)
@@ -68,7 +71,8 @@ impl<T: tauri::Manager<tauri::Wry>> TrayPluginExt<tauri::Wry> for T {
                     TrayItem::Start => {
                         use tauri_plugin_windows::{HyprWindow, WindowsPluginExt};
                         if let Ok(_) = app.window_show(HyprWindow::Main) {
-                            let _ = app.window_navigate(HyprWindow::Main, "/app/new?record=true");
+                            let _ =
+                                app.window_emit_navigate(HyprWindow::Main, "/app/new?record=true");
                         }
                     }
                     TrayItem::Quit => {
@@ -80,18 +84,38 @@ impl<T: tauri::Manager<tauri::Wry>> TrayPluginExt<tauri::Wry> for T {
 
         Ok(())
     }
+
+    fn set_start_disabled(&self, disabled: bool) -> Result<()> {
+        let app = self.app_handle();
+
+        if let Some(tray) = app.tray_by_id(TRAY_ID) {
+            let menu = Menu::with_items(
+                app,
+                &[
+                    &open_menu(app)?,
+                    &start_menu(app, disabled)?,
+                    &PredefinedMenuItem::separator(app)?,
+                    &quit_menu(app)?,
+                ],
+            )?;
+
+            tray.set_menu(Some(menu))?;
+        }
+
+        Ok(())
+    }
 }
 
 fn open_menu<R: tauri::Runtime>(app: &AppHandle<R>) -> Result<MenuItem<R>> {
     MenuItem::with_id(app, TrayItem::Open, "Open Hyprnote", true, None::<&str>)
 }
 
-fn start_menu<R: tauri::Runtime>(app: &AppHandle<R>) -> Result<MenuItem<R>> {
+fn start_menu<R: tauri::Runtime>(app: &AppHandle<R>, disabled: bool) -> Result<MenuItem<R>> {
     MenuItem::with_id(
         app,
         TrayItem::Start,
         "Start a new meeting",
-        true,
+        !disabled,
         None::<&str>,
     )
 }