diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 46baa9c2..07ea4ea3 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -23,9 +23,9 @@ use sqlx::sqlite::SqlitePoolOptions; use sqlx::types::Json; use sqlx::{Pool, Sqlite}; use tauri::regex::Regex; -use tauri::{ - AppHandle, Menu, MenuItem, RunEvent, State, Submenu, TitleBarStyle, Window, WindowUrl, Wry, -}; +#[cfg(target_os = "macos")] +use tauri::TitleBarStyle; +use tauri::{AppHandle, Menu, MenuItem, RunEvent, State, Submenu, Window, WindowUrl, Wry}; use tauri::{CustomMenuItem, Manager, WindowEvent}; use tokio::sync::Mutex; @@ -697,7 +697,7 @@ fn create_window(handle: &AppHandle, url: Option<&str>) -> Window { let window_num = handle.windows().len(); let window_id = format!("wnd_{}_{}", window_num, generate_id(None)); let menu = default_menu.add_submenu(submenu); - let win = tauri::WindowBuilder::new( + let mut win_builder = tauri::WindowBuilder::new( handle, window_id, WindowUrl::App(url.unwrap_or_default().into()), @@ -711,14 +711,20 @@ fn create_window(handle: &AppHandle, url: Option<&str>) -> Window { 100.0 + random::() * 30.0, 100.0 + random::() * 30.0, ) - .hidden_title(true) .title(match is_dev() { true => "Yaak Dev", false => "Yaak", - }) - .title_bar_style(TitleBarStyle::Overlay) - .build() - .expect("failed to build window"); + }); + + // Add macOS-only things + #[cfg(target_os = "macos")] + { + win_builder = win_builder + .hidden_title(true) + .title_bar_style(TitleBarStyle::Overlay); + } + + let win = win_builder.build().expect("failed to build window"); let win2 = win.clone(); let handle2 = handle.clone(); diff --git a/src-web/components/Workspace.tsx b/src-web/components/Workspace.tsx index d69e1219..1bea0a95 100644 --- a/src-web/components/Workspace.tsx +++ b/src-web/components/Workspace.tsx @@ -177,8 +177,6 @@ function HeaderSize({ className, ...props }: HeaderSizeProps) { className, 'h-md pt-[1px] flex items-center w-full pr-3 pl-20 border-b', platform?.osType === 'Darwin' && 'pl-20', - platform?.osType === 'Linux' && 'pr-20', - platform?.osType === 'Windows_NT' && 'pr-20', )} {...props} />