fix: cleanup

SpikeHD · Sep 21, 2024 · 3427044 · 3427044
1 parent c8e2a8d
commit 3427044
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/src-tauri/src/functionality/streamer_mode.rs b/src-tauri/src/functionality/streamer_mode.rs
@@ -17,6 +17,7 @@ pub fn start_streamer_mode_watcher(win: tauri::WebviewWindow) {
     return;
   }
 
+  // TODO integrate this into rsRPC somehow
   // Check processes every couple seconds to see if OBS is open
   std::thread::spawn(move || loop {
     std::thread::sleep(std::time::Duration::from_secs(2));

diff --git a/src-tauri/src/functionality/tray.rs b/src-tauri/src/functionality/tray.rs
@@ -6,7 +6,7 @@ use tauri::{
   AppHandle, Manager,
 };
 
-use crate::log;
+use crate::{log, util::window_helpers::ultrashow};
 
 flate!(static DEFAULT: [u8] from "./icons/32x32.png");
 flate!(static CONNECTED: [u8] from "./icons/tray/connected.png");
@@ -64,9 +64,7 @@ pub fn create_tray(app: &AppHandle) -> Result<(), tauri::Error> {
       }
       "open" => {
         if let Some(win) = app.get_webview_window("main") {
-          win.show().unwrap_or_default();
-          win.set_focus().unwrap_or_default();
-          win.unminimize().unwrap_or_default();
+          ultrashow(&win);
         }
       }
       "restart" => {
@@ -89,9 +87,8 @@ pub fn create_tray(app: &AppHandle) -> Result<(), tauri::Error> {
       } = event
       {
         let app = tray.app_handle();
-        if let Some(webview_window) = app.get_webview_window("main") {
-          let _ = webview_window.show();
-          let _ = webview_window.set_focus();
+        if let Some(win) = app.get_webview_window("main") {
+          ultrashow(&win);
         }
       }
     })

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -20,7 +20,7 @@ use util::{
   logger::log,
   notifications,
   paths::get_webdata_dir,
-  window_helpers::{self, clear_cache_check, set_user_agent},
+  window_helpers::{self, clear_cache_check, set_user_agent, ultrashow},
 };
 
 use crate::{
@@ -248,9 +248,7 @@ fn main() {
                 }
               };
 
-              win.set_focus().unwrap_or_default();
-              win.unminimize().unwrap_or_default();
-              win.show().unwrap_or_default();
+              ultrashow(&win);
             },
           ))
           .unwrap_or_else(|_| log!("Failed to register single instance plugin"));

diff --git a/src-tauri/src/util/window_helpers.rs b/src-tauri/src/util/window_helpers.rs
@@ -147,3 +147,10 @@ pub fn set_user_agent(win: &tauri::WebviewWindow) {
     })
     .expect("Failed to set user agent!");
 }
+
+/// Stupid name but this just ensures the window is visible regardless of being unfocused/minimized/hidden
+pub fn ultrashow(win: &tauri::WebviewWindow) {
+  win.unminimize().unwrap_or_default();
+  win.show().unwrap_or_default();
+  win.set_focus().unwrap_or_default();
+}