diff --git a/src-tauri/src/app/setup.rs b/src-tauri/src/app/setup.rs index 20e2f1c..d1b6da8 100644 --- a/src-tauri/src/app/setup.rs +++ b/src-tauri/src/app/setup.rs @@ -1,14 +1,14 @@ use crate::utils; -use tauri::{ - utils::{config::WindowUrl, TitleBarStyle}, - window::WindowBuilder, - App, -}; +use tauri::{utils::config::WindowUrl, window::WindowBuilder, App}; + +#[cfg(target_os = "macos")] +use tauri::TitleBarStyle; pub fn init(app: &mut App) -> std::result::Result<(), Box> { let conf = utils::get_tauri_conf().unwrap(); let url = conf.build.dev_path.to_string(); + #[cfg(target_os = "macos")] WindowBuilder::new(app, "core", WindowUrl::App(url.into())) .resizable(true) .fullscreen(false) @@ -20,5 +20,16 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box .user_agent("5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36") .build()?; + #[cfg(not(target_os = "macos"))] + WindowBuilder::new(app, "core", WindowUrl::App(url.into())) + .resizable(true) + .fullscreen(false) + .initialization_script(include_str!("../core.js")) + .initialization_script(&utils::user_script()) + .inner_size(800.0, 600.0) + .hidden_title(true) + .user_agent("5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36") + .build()?; + Ok(()) }