From c3f4403145a23311f5a81c3548fd002d922965ab Mon Sep 17 00:00:00 2001
From: John Costa <johncosta027@gmail.com>
Date: Sat, 19 Apr 2025 15:42:14 +0100
Subject: [PATCH] fix(linux-tauri): window building on linux

---
 frontend/src-tauri/src/shortcut.rs |  5 ++++-
 frontend/src-tauri/src/window.rs   | 19 +++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/frontend/src-tauri/src/shortcut.rs b/frontend/src-tauri/src/shortcut.rs
index 7a65bf5..b853778 100644
--- a/frontend/src-tauri/src/shortcut.rs
+++ b/frontend/src-tauri/src/shortcut.rs
@@ -127,7 +127,10 @@ fn _register_shortcut<R: Runtime>(app: &AppHandle<R>, shortcut: Shortcut) {
 
 /// Helper function to register shortcuts during application startup
 fn _register_shortcut_upon_start(app: &App, shortcut: Shortcut) {
-    let window = app.get_webview_window("main").unwrap();
+    let window = app
+        .get_webview_window("main")
+        .expect("webview to be defined");
+
     // Initialize global shortcut and set its handler
     app.handle()
         .plugin(
diff --git a/frontend/src-tauri/src/window.rs b/frontend/src-tauri/src/window.rs
index 77958c4..5c8767f 100644
--- a/frontend/src-tauri/src/window.rs
+++ b/frontend/src-tauri/src/window.rs
@@ -1,24 +1,22 @@
 use tauri::App;
-use tauri::TitleBarStyle;
 use tauri::{WebviewUrl, WebviewWindowBuilder};
 
 pub fn setup_window(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
     let win_builder = WebviewWindowBuilder::new(app, "main", WebviewUrl::default())
         .inner_size(480.0, 360.0)
         .title("Haystack")
-        .hidden_title(true)
         .resizable(false);
 
-    //
-    #[cfg(target_os = "macos")]
-    let win_builder = win_builder.title_bar_style(TitleBarStyle::Transparent);
-
-    let window = win_builder.build().unwrap();
-
     #[cfg(target_os = "macos")]
     {
         use cocoa::appkit::{NSColor, NSWindow};
         use cocoa::base::{id, nil};
+        use tauri::TitleBarStyle;
+
+        let win_builder = win_builder
+            .hidden_title(true)
+            .title_bar_style(TitleBarStyle::Transparent);
+        let window = win_builder.build().unwrap();
 
         let ns_window = window.ns_window().unwrap() as id;
         unsafe {
@@ -33,5 +31,10 @@ pub fn setup_window(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
         }
     }
 
+    #[cfg(target_os = "linux")]
+    {
+        win_builder.build().unwrap();
+    }
+
     Ok(())
 }