From 375a490ef791a09fa37504a1c05d2b637c6227d6 Mon Sep 17 00:00:00 2001 From: chrox Date: Wed, 13 Nov 2024 17:41:41 +0100 Subject: [PATCH] Fix build on Windows platform --- apps/readest-app/src-tauri/src/lib.rs | 21 ++++++++++++++++----- apps/readest-app/src-tauri/tauri.conf.json | 7 ++++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/apps/readest-app/src-tauri/src/lib.rs b/apps/readest-app/src-tauri/src/lib.rs index 41ceabf5..bbd599b5 100644 --- a/apps/readest-app/src-tauri/src/lib.rs +++ b/apps/readest-app/src-tauri/src/lib.rs @@ -9,16 +9,22 @@ extern crate objc; #[cfg(target_os = "macos")] mod tauri_traffic_light_positioner_plugin; -use tauri::{TitleBarStyle, WebviewUrl, WebviewWindowBuilder}; +#[cfg(target_os = "macos")] +use tauri::TitleBarStyle; +use tauri::{WebviewUrl, WebviewWindowBuilder}; #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { - tauri::Builder::default() + let builder = tauri::Builder::default() .plugin(tauri_plugin_http::init()) .plugin(tauri_plugin_os::init()) .plugin(tauri_plugin_dialog::init()) - .plugin(tauri_plugin_fs::init()) - .plugin(tauri_traffic_light_positioner_plugin::init()) + .plugin(tauri_plugin_fs::init()); + + #[cfg(target_os = "macos")] + let builder = builder.plugin(tauri_traffic_light_positioner_plugin::init()); + + builder .setup(|app| { if cfg!(debug_assertions) { app.handle().plugin( @@ -34,7 +40,12 @@ pub fn run() { .maximized(true); #[cfg(target_os = "macos")] - let win_builder = win_builder.title_bar_style(TitleBarStyle::Overlay); + let win_builder = win_builder + .decorations(true) + .title_bar_style(TitleBarStyle::Overlay); + + #[cfg(not(target_os = "macos"))] + let win_builder = win_builder.decorations(false).transparent(true); let _ = win_builder.build().unwrap(); diff --git a/apps/readest-app/src-tauri/tauri.conf.json b/apps/readest-app/src-tauri/tauri.conf.json index 009d6c00..b338fd58 100644 --- a/apps/readest-app/src-tauri/tauri.conf.json +++ b/apps/readest-app/src-tauri/tauri.conf.json @@ -38,7 +38,12 @@ "icons/icon.icns", "icons/icon.ico" ], - "resources": [] + "resources": [], + "windows": { + "webviewInstallMode": { + "type": "embedBootstrapper" + } + } }, "plugins": { "fs": {