wip

Author: oscartbeaumont

apps/desktop/src-tauri/src/lib.rs

@@ -1276,7 +1276,7 @@ async fn take_screenshot(app: AppHandle, _state: MutableState<'_, App>) -> Resul
 
         use cap_project::*;
         RecordingMeta {
-            platform: Platform::default(),
+            platform: Some(Platform::default()),
             project_path: recording_dir.clone(),
             sharing: None,
             pretty_name: screenshot_name,

apps/desktop/src-tauri/src/recording.rs

@@ -772,7 +772,7 @@ async fn handle_recording_finish(
     };
 
     let meta = RecordingMeta {
-        platform: Platform::default(),
+        platform: Some(Platform::default()),
         project_path: recording_dir.clone(),
         sharing,
         pretty_name: format!(

apps/desktop/src-tauri/src/windows.rs

@@ -167,7 +167,7 @@ pub enum ShowCapWindow {
     WindowCaptureOccluder { screen_id: u32 },
     CaptureArea { screen_id: u32 },
     Camera,
-    InProgressRecording { position: Option<(f64, f64)> },
+    InProgressRecording { countdown: Option<u32> },
     Upgrade,
     ModeSelect,
 }
@@ -309,8 +309,6 @@ impl ShowCapWindow {
             Self::Camera => {
                 const WINDOW_SIZE: f64 = 230.0 * 2.0;
 
-                let port = app.state::<Arc<RwLock<App>>>().read().await.camera_ws_port;
-
                 let mut window_builder = self
                     .window_builder(app, "/camera")
                     .maximized(false)
@@ -326,12 +324,6 @@ impl ShowCapWindow {
                             - WINDOW_SIZE
                             - 100.0,
                     )
-                    .initialization_script(&format!(
-                        "
-			                window.__CAP__ = window.__CAP__ ?? {{}};
-			                window.__CAP__.cameraWsPort = {port};
-		                ",
-                    ))
                     .transparent(true);
 
                 let window = window_builder.build()?;

crates/project/src/meta.rs

@@ -61,7 +61,7 @@ impl Default for Platform {
 #[derive(Debug, Clone, Serialize, Deserialize, Type)]
 pub struct RecordingMeta {
     #[serde(default)]
-    pub platform: Platform,
+    pub platform: Option<Platform>,
     // this field is just for convenience, it shouldn't be persisted
     #[serde(skip_serializing, default)]
     pub project_path: PathBuf,

crates/rendering/src/layers/cursor.rs

@@ -304,10 +304,18 @@ impl CursorLayer {
             let cursor_size_constant =
                 factor * cursor_size_percentage * zoom.display_amount() as f32;
 
-            XY::new(
-                cursor_size_constant * cursor_texture_size_aspect,
-                cursor_size_constant,
-            )
+            if cursor_texture_size_aspect > 1.0 {
+                // Wide cursor: base sizing on width to prevent excessive width
+                let width = cursor_size_constant;
+                let height = cursor_size_constant / cursor_texture_size_aspect;
+                XY::new(width, height)
+            } else {
+                // Tall or square cursor: base sizing on height (current behavior)
+                XY::new(
+                    cursor_size_constant * cursor_texture_size_aspect,
+                    cursor_size_constant,
+                )
+            }
         };
 
         let click_scale_factor = get_click_t(&cursor.clicks, (time_s as f64) * 1000.0)