Editor now opens on Windows. Update plugin decorum version

CapSoftware · Oct 18, 2024 · 3ed85a3 · 3ed85a3
1 parent b5ac506
commit 3ed85a3
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
@@ -28,7 +28,7 @@ tauri-plugin-shell = "2.0.0-rc"
 tauri-plugin-store = "2.0.0-rc.0"
 tauri-plugin-os = "2.0.0-rc.0"
 tauri-plugin-process = "2.0.0-rc.0"
-tauri-plugin-decorum = "1.0.0"
+tauri-plugin-decorum = "1.1.1"
 tauri-plugin-dialog = "2.0.0-rc.0"
 tauri-plugin-notification = "2.0.0-rc.0"
 tauri-plugin-updater = "2.0.0-rc.0"

diff --git a/apps/desktop/src-tauri/src/lib.rs b/apps/desktop/src-tauri/src/lib.rs
@@ -1164,8 +1164,8 @@ async fn get_video_metadata(
         .join("recordings")
         .join(format!("{}.cap", video_id));
 
-    let screen_video_path = video_dir.join("content/display.mp4");
-    let output_video_path = video_dir.join("output/result.mp4");
+    let screen_video_path = video_dir.join("content").join("display.mp4");
+    let output_video_path = video_dir.join("output").join("result.mp4");
 
     let video_path = match video_type {
         Some(VideoType::Screen) => {
@@ -1565,9 +1565,9 @@ async fn upload_rendered_video(
                     .join(format!("{}.cap", video_id));
 
                 let files_to_upload = vec![
-                    (video_dir.join("content/audio-input.mp3"), true),
-                    (video_dir.join("content/camera.mp4"), false),
-                    (video_dir.join("content/display.mp4"), false),
+                    (video_dir.join("content").join("audio-input.mp3"), true),
+                    (video_dir.join("content").join("camera.mp4"), false),
+                    (video_dir.join("content").join("display.mp4"), false),
                 ];
 
                 for (file_path, is_audio) in files_to_upload {

diff --git a/apps/desktop/src-tauri/src/windows.rs b/apps/desktop/src-tauri/src/windows.rs
@@ -1,7 +1,6 @@
 #![allow(unused_mut)]
 use tauri::{AppHandle, Manager, WebviewUrl, WebviewWindow, Wry};
 
-#[cfg(target_os = "macos")]
 use tauri_plugin_decorum::WebviewWindowExt;
 
 pub enum CapWindow {
@@ -468,9 +467,9 @@ impl CapWindow {
 }
 
 fn apply_window_chrome(window: &WebviewWindow<Wry>) {
+    window.create_overlay_titlebar().unwrap();
     #[cfg(target_os = "macos")]
     {
-        window.create_overlay_titlebar().unwrap();
         window.set_traffic_lights_inset(14.0, 22.0).unwrap();
     }
 }