Merge pull request #1432 from CapSoftware/screenshot-ux

feat: Screenshot editor overhaul - layers panel, keyboard shortcuts, and sharper rendering

Author: richiemcilroy

.github/workflows/ci.yml

@@ -103,9 +103,8 @@ jobs:
         settings:
           - target: aarch64-apple-darwin
             runner: macos-latest
-          # Windows can't take the disk usage lol
-          # - target: x86_64-pc-windows-msvc
-          #   runner: windows-latest
+          - target: x86_64-pc-windows-msvc
+            runner: windows-latest
     runs-on: ${{ matrix.settings.runner }}
     permissions:
       contents: read

.vscode/extensions.json

@@ -1,3 +1,3 @@
 {
-	"recommendations": ["tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
+	"recommendations": ["biomejs.biome", "rust-lang.rust-analyzer"]
 }

AGENTS.md

@@ -22,6 +22,26 @@
 - Runtime: Node 20, pnpm 10.x, Rust 1.88+, Docker for MySQL/MinIO.
 - **NO COMMENTS**: Never add comments to code (`//`, `/* */`, `///`, `//!`, `#`, etc.). Code must be self-explanatory through naming, types, and structure. This applies to all languages (TypeScript, Rust, JavaScript, etc.).
 
+## Rust Clippy Rules (Workspace Lints)
+All Rust code must respect these workspace-level lints defined in `Cargo.toml`:
+
+**Rust compiler lints:**
+- `unused_must_use = "deny"` — Always handle `Result`/`Option` or types marked `#[must_use]`; never ignore them.
+
+**Clippy lints (all denied):**
+- `dbg_macro` — Never use `dbg!()` in code; use proper logging instead.
+- `let_underscore_future` — Never write `let _ = async_fn()` which silently drops futures; await or explicitly handle them.
+- `unchecked_duration_subtraction` — Use `saturating_sub` instead of `-` for `Duration` to avoid panics.
+- `collapsible_if` — Merge nested `if` statements: use `if a && b { }` instead of `if a { if b { } }`.
+- `clone_on_copy` — Don't call `.clone()` on `Copy` types; just copy them directly.
+- `redundant_closure` — Use function references directly: `iter.map(foo)` instead of `iter.map(|x| foo(x))`.
+- `ptr_arg` — Accept `&[T]` or `&str` instead of `&Vec<T>` or `&String` in function parameters.
+- `len_zero` — Use `.is_empty()` instead of `.len() == 0` or `.len() > 0`.
+- `let_unit_value` — Don't assign `()` to a variable: write `foo();` instead of `let _ = foo();` when return is unit.
+- `unnecessary_lazy_evaluations` — Use `.unwrap_or(val)` instead of `.unwrap_or_else(|| val)` for cheap values.
+- `needless_range_loop` — Use `for item in &collection` instead of `for i in 0..collection.len()` when index isn't needed.
+- `manual_clamp` — Use `.clamp(min, max)` instead of manual `if` chains or `.min().max()` patterns.
+
 ## Testing
 - TS/JS: Vitest where present (e.g., desktop). Name tests `*.test.ts(x)` near sources.
 - Rust: `cargo test` per crate; tests in `src` or `tests`.

CLAUDE.md

@@ -371,6 +371,66 @@ Minimize `useEffect` usage: compute during render, handle logic in event handler
 - Strict TypeScript; avoid `any`; leverage shared types
 - Use Biome for linting/formatting; match existing formatting
 
+## Rust Clippy Rules (Workspace Lints)
+All Rust code must respect these workspace-level lints defined in `Cargo.toml`. Violating any of these will fail CI:
+
+**Rust compiler lints:**
+- `unused_must_use = "deny"` — Always handle `Result`/`Option` or types marked `#[must_use]`; never ignore them.
+
+**Clippy lints (all denied — code MUST NOT contain these patterns):**
+- `dbg_macro` — Never use `dbg!()` in code; use proper logging (`tracing::debug!`, etc.) instead.
+- `let_underscore_future` — Never write `let _ = async_fn()` which silently drops futures; await or explicitly handle them.
+- `unchecked_duration_subtraction` — Use `duration.saturating_sub(other)` instead of `duration - other` to avoid panics on underflow.
+- `collapsible_if` — Merge nested `if` statements: write `if a && b { }` instead of `if a { if b { } }`.
+- `clone_on_copy` — Don't call `.clone()` on `Copy` types (integers, bools, etc.); just copy them directly.
+- `redundant_closure` — Use function references directly: `iter.map(foo)` instead of `iter.map(|x| foo(x))`.
+- `ptr_arg` — Accept `&[T]` or `&str` instead of `&Vec<T>` or `&String` in function parameters for flexibility.
+- `len_zero` — Use `.is_empty()` instead of `.len() == 0` or `.len() > 0` / `.len() != 0`.
+- `let_unit_value` — Don't assign `()` to a variable: write `foo();` instead of `let _ = foo();` or `let x = foo();` when return is unit.
+- `unnecessary_lazy_evaluations` — Use `.unwrap_or(val)` instead of `.unwrap_or_else(|| val)` when the default is a simple/cheap value.
+- `needless_range_loop` — Use `for item in &collection` or `for (i, item) in collection.iter().enumerate()` instead of `for i in 0..collection.len()`.
+- `manual_clamp` — Use `value.clamp(min, max)` instead of manual `if` chains or `.min(max).max(min)` patterns.
+
+**Examples of violations to avoid:**
+
+```rust
+dbg!(value);
+let _ = some_async_function();
+let duration = duration_a - duration_b;
+if condition {
+    if other_condition {
+        do_something();
+    }
+}
+let x = 5.clone();
+vec.iter().map(|x| process(x))
+fn example(v: &Vec<i32>) { }
+if vec.len() == 0 { }
+let _ = returns_unit();
+option.unwrap_or_else(|| 42)
+for i in 0..vec.len() { println!("{}", vec[i]); }
+value.min(max).max(min)
+```
+
+**Correct alternatives:**
+
+```rust
+tracing::debug!(?value);
+some_async_function().await;
+let duration = duration_a.saturating_sub(duration_b);
+if condition && other_condition {
+    do_something();
+}
+let x = 5;
+vec.iter().map(process)
+fn example(v: &[i32]) { }
+if vec.is_empty() { }
+returns_unit();
+option.unwrap_or(42)
+for item in &vec { println!("{}", item); }
+value.clamp(min, max)
+```
+
 ## Security & Privacy Considerations
 
 ### Data Handling

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

@@ -140,6 +140,6 @@ fn samples_to_f64(samples: &MicrophoneSamples) -> impl Iterator<Item = f64> + us
             SampleFormat::F64 => f64::from_ne_bytes([
                 data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7],
             ]),
-            _ => todo!(),
+            _ => 0.0,
         })
 }

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

@@ -43,9 +43,9 @@ pub enum CameraPreviewShape {
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Type)]
 pub struct CameraPreviewState {
-    size: f32,
-    shape: CameraPreviewShape,
-    mirrored: bool,
+    pub size: f32,
+    pub shape: CameraPreviewShape,
+    pub mirrored: bool,
 }
 
 impl Default for CameraPreviewState {

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

@@ -115,30 +115,28 @@ async fn extract_audio_from_video(video_path: &str, output_path: &PathBuf) -> Re
                     if mixed_samples.is_empty() {
                         mixed_samples = audio.samples().to_vec();
                         channel_count = audio.channels() as usize;
-                    } else {
-                        if audio.channels() as usize != channel_count {
-                            log::info!(
-                                "Channel count mismatch: {} vs {}, mixing to mono",
-                                channel_count,
-                                audio.channels()
-                            );
-
-                            if channel_count > 1 {
-                                let mono_samples = convert_to_mono(&mixed_samples, channel_count);
-                                mixed_samples = mono_samples;
-                                channel_count = 1;
-                            }
+                    } else if audio.channels() as usize != channel_count {
+                        log::info!(
+                            "Channel count mismatch: {} vs {}, mixing to mono",
+                            channel_count,
+                            audio.channels()
+                        );
 
-                            let samples = if audio.channels() > 1 {
-                                convert_to_mono(audio.samples(), audio.channels() as usize)
-                            } else {
-                                audio.samples().to_vec()
-                            };
+                        if channel_count > 1 {
+                            let mono_samples = convert_to_mono(&mixed_samples, channel_count);
+                            mixed_samples = mono_samples;
+                            channel_count = 1;
+                        }
 
-                            mix_samples(&mut mixed_samples, &samples);
+                        let samples = if audio.channels() > 1 {
+                            convert_to_mono(audio.samples(), audio.channels() as usize)
                         } else {
-                            mix_samples(&mut mixed_samples, audio.samples());
-                        }
+                            audio.samples().to_vec()
+                        };
+
+                        mix_samples(&mut mixed_samples, &samples);
+                    } else {
+                        mix_samples(&mut mixed_samples, audio.samples());
                     }
                 }
                 Err(e) => {
@@ -1012,13 +1010,11 @@ fn start_whisperx_server(
     std::thread::spawn(move || {
         use std::io::BufRead;
         let reader = std::io::BufReader::new(stderr);
-        for line in reader.lines() {
-            if let Ok(line) = line {
-                if line.starts_with("STDERR:") {
-                    log::info!("[WhisperX] {}", &line[7..]);
-                } else {
-                    log::info!("[WhisperX stderr] {}", line);
-                }
+        for line in reader.lines().flatten() {
+            if let Some(stripped) = line.strip_prefix("STDERR:") {
+                log::info!("[WhisperX] {}", stripped);
+            } else {
+                log::info!("[WhisperX stderr] {}", line);
             }
         }
     });

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

@@ -1,6 +1,6 @@
 use crate::{FramesRendered, get_video_metadata};
 use cap_export::ExporterBase;
-use cap_project::{RecordingMeta, XY};
+use cap_project::RecordingMeta;
 use serde::Deserialize;
 use specta::Type;
 use std::path::PathBuf;

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

@@ -3,10 +3,10 @@ use cap_fail::fail;
 use cap_project::CursorMoveEvent;
 use cap_project::cursor::SHORT_CURSOR_SHAPE_DEBOUNCE_MS;
 use cap_project::{
-    CursorClickEvent, InstantRecordingMeta, MultipleSegments, Platform, ProjectConfiguration,
-    RecordingMeta, RecordingMetaInner, SharingMeta, StudioRecordingMeta, StudioRecordingStatus,
-    TimelineConfiguration, TimelineSegment, UploadMeta, ZoomMode, ZoomSegment,
-    cursor::CursorEvents,
+    CameraShape, CursorClickEvent, InstantRecordingMeta, MultipleSegments, Platform,
+    ProjectConfiguration, RecordingMeta, RecordingMetaInner, SharingMeta, StudioRecordingMeta,
+    StudioRecordingStatus, TimelineConfiguration, TimelineSegment, UploadMeta, ZoomMode,
+    ZoomSegment, cursor::CursorEvents,
 };
 use cap_recording::feeds::camera::CameraFeedLock;
 #[cfg(target_os = "macos")]
@@ -42,6 +42,7 @@ use tauri_plugin_dialog::{DialogExt, MessageDialogBuilder};
 use tauri_specta::Event;
 use tracing::*;
 
+use crate::camera::{CameraPreviewManager, CameraPreviewShape};
 use crate::web_api::AuthedApiError;
 use crate::{
     App, CurrentRecordingChanged, MutableState, NewStudioRecordingAdded, RecordingState,
@@ -1680,6 +1681,24 @@ fn project_config_from_recording(
 
     let mut config = default_config.unwrap_or_default();
 
+    let camera_preview_manager = CameraPreviewManager::new(app);
+    if let Ok(camera_preview_state) = camera_preview_manager.get_state() {
+        match camera_preview_state.shape {
+            CameraPreviewShape::Round => {
+                config.camera.shape = CameraShape::Square;
+                config.camera.rounding = 100.0;
+            }
+            CameraPreviewShape::Square => {
+                config.camera.shape = CameraShape::Square;
+                config.camera.rounding = 25.0;
+            }
+            CameraPreviewShape::Full => {
+                config.camera.shape = CameraShape::Source;
+                config.camera.rounding = 25.0;
+            }
+        }
+    }
+
     let timeline_segments = recordings
         .segments
         .iter()

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

@@ -30,6 +30,7 @@ pub struct ScreenshotEditorInstance {
     pub ws_shutdown_token: CancellationToken,
     pub config_tx: watch::Sender<ProjectConfiguration>,
     pub path: PathBuf,
+    pub pretty_name: String,
 }
 
 impl ScreenshotEditorInstance {
@@ -140,8 +141,31 @@ impl ScreenshotEditorInstances {
                         let rgba_img: image::RgbaImage = rgb_img.convert();
                         (rgba_img.into_raw(), width, height)
                     } else {
-                        let img =
-                            image::open(&path).map_err(|e| format!("Failed to open image: {e}"))?;
+                        let image_path = if path.is_dir() {
+                            let original = path.join("original.png");
+                            if original.exists() {
+                                original
+                            } else {
+                                std::fs::read_dir(&path)
+                                    .ok()
+                                    .and_then(|dir| {
+                                        dir.flatten()
+                                            .find(|e| {
+                                                e.path().extension().and_then(|s| s.to_str())
+                                                    == Some("png")
+                                            })
+                                            .map(|e| e.path())
+                                    })
+                                    .ok_or_else(|| {
+                                        format!("No PNG file found in directory: {:?}", path)
+                                    })?
+                            }
+                        } else {
+                            path.clone()
+                        };
+
+                        let img = image::open(&image_path)
+                            .map_err(|e| format!("Failed to open image: {e}"))?;
                         let (w, h) = img.dimensions();
 
                         if w > MAX_DIMENSION || h > MAX_DIMENSION {
@@ -156,15 +180,22 @@ impl ScreenshotEditorInstances {
                     }
                 };
 
-                // Try to load existing meta if in a .cap directory
-                let (recording_meta, loaded_config) = if let Some(parent) = path.parent() {
+                let cap_dir = if path.extension().and_then(|s| s.to_str()) == Some("cap") {
+                    Some(path.clone())
+                } else if let Some(parent) = path.parent() {
                     if parent.extension().and_then(|s| s.to_str()) == Some("cap") {
-                        let meta = RecordingMeta::load_for_project(parent).ok();
-                        let config = ProjectConfiguration::load(parent).ok();
-                        (meta, config)
+                        Some(parent.to_path_buf())
                     } else {
-                        (None, None)
+                        None
                     }
+                } else {
+                    None
+                };
+
+                let (recording_meta, loaded_config) = if let Some(cap_dir) = &cap_dir {
+                    let meta = RecordingMeta::load_for_project(cap_dir).ok();
+                    let config = ProjectConfiguration::load(cap_dir).ok();
+                    (meta, config)
                 } else {
                     (None, None)
                 };
@@ -264,6 +295,7 @@ impl ScreenshotEditorInstances {
                     ws_shutdown_token,
                     config_tx,
                     path: path.clone(),
+                    pretty_name: recording_meta.pretty_name.clone(),
                 });
 
                 // Spawn render loop
@@ -375,6 +407,7 @@ pub struct SerializedScreenshotEditorInstance {
     pub frames_socket_url: String,
     pub path: PathBuf,
     pub config: Option<ProjectConfiguration>,
+    pub pretty_name: String,
 }
 
 #[tauri::command]
@@ -404,6 +437,7 @@ pub async fn create_screenshot_editor_instance(
         frames_socket_url: format!("ws://localhost:{}", instance.ws_port),
         path: instance.path.clone(),
         config: Some(config),
+        pretty_name: instance.pretty_name.clone(),
     })
 }