Merge pull request #1481 from CapSoftware/feedback-bits

tired

Author: richiemcilroy

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

@@ -2931,9 +2931,19 @@ pub async fn run(recording_logging_handle: LoggingHandle, logs_dir: PathBuf) {
 
             match event {
                 WindowEvent::CloseRequested { .. } => {
-                    if let Ok(CapWindowId::Camera) = CapWindowId::from_str(label) {
-                        tracing::warn!("Camera window CloseRequested event received!");
-                        tokio::spawn(cleanup_camera_window(app.clone()));
+                    if let Ok(window_id) = CapWindowId::from_str(label) {
+                        match window_id {
+                            CapWindowId::Camera => {
+                                tracing::warn!("Camera window CloseRequested event received!");
+                                tokio::spawn(cleanup_camera_window(app.clone()));
+                            }
+                            CapWindowId::Main => {
+                                if let Some(camera_window) = CapWindowId::Camera.get(app) {
+                                    let _ = camera_window.close();
+                                }
+                            }
+                            _ => {}
+                        }
                     }
                 }
                 WindowEvent::Destroyed => {

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

@@ -527,7 +527,14 @@ fn handle_previous_item_click(app: &AppHandle, path_str: &str) {
     }
 }
 
+pub fn get_tray_icon() -> &'static [u8] {
+    include_bytes!("../icons/tray-default-icon.png")
+}
+
 pub fn get_mode_icon(mode: RecordingMode) -> &'static [u8] {
+    if cfg!(target_os = "windows") {
+        return get_tray_icon();
+    }
     match mode {
         RecordingMode::Studio => include_bytes!("../icons/tray-default-icon-studio.png"),
         RecordingMode::Instant => include_bytes!("../icons/tray-default-icon-instant.png"),
@@ -536,6 +543,10 @@ pub fn get_mode_icon(mode: RecordingMode) -> &'static [u8] {
 }
 
 pub fn update_tray_icon_for_mode(app: &AppHandle, mode: RecordingMode) {
+    if cfg!(target_os = "windows") {
+        return;
+    }
+
     let Some(tray) = app.tray_by_id("tray") else {
         return;
     };
@@ -734,6 +745,11 @@ pub fn create_tray(app: &AppHandle) -> tauri::Result<()> {
         let is_recording = is_recording.clone();
         move |_| {
             is_recording.store(true, Ordering::Relaxed);
+
+            if cfg!(target_os = "windows") {
+                return;
+            }
+
             let Some(tray) = app.tray_by_id("tray") else {
                 return;
             };
@@ -749,6 +765,11 @@ pub fn create_tray(app: &AppHandle) -> tauri::Result<()> {
         let is_recording = is_recording.clone();
         move |_| {
             is_recording.store(false, Ordering::Relaxed);
+
+            if cfg!(target_os = "windows") {
+                return;
+            }
+
             let Some(tray) = app_handle.tray_by_id("tray") else {
                 return;
             };

apps/desktop/src/routes/editor/Editor.tsx

@@ -206,12 +206,18 @@ function Inner() {
 		}),
 	);
 
-	const updateConfigAndRender = throttle(async (time: number) => {
+	const doConfigUpdate = async (time: number) => {
 		const config = serializeProjectConfiguration(project);
 		await commands.updateProjectConfigInMemory(config);
 		canvasControls()?.resetFrameState();
 		renderFrame(time);
-	}, 1000 / FPS);
+	};
+	const throttledConfigUpdate = throttle(doConfigUpdate, 1000 / FPS);
+	const trailingConfigUpdate = debounce(doConfigUpdate, 1000 / FPS + 16);
+	const updateConfigAndRender = (time: number) => {
+		throttledConfigUpdate(time);
+		trailingConfigUpdate(time);
+	};
 	createEffect(
 		on(
 			() => trackDeep(project),

apps/desktop/src/routes/editor/PresetsDropdown.tsx

@@ -50,6 +50,7 @@ export function PresetsDropdown() {
 										const normalizedConfig = normalizeProject({
 											...preset.config,
 											timeline: project.timeline,
+											clips: project.clips,
 										});
 										setProject(reconcile(normalizedConfig));
 									}

apps/desktop/src/routes/screenshot-editor/context.tsx

@@ -1,6 +1,6 @@
 import { createContextProvider } from "@solid-primitives/context";
 import { trackStore } from "@solid-primitives/deep";
-import { debounce } from "@solid-primitives/scheduled";
+import { debounce, throttle } from "@solid-primitives/scheduled";
 import { makePersisted } from "@solid-primitives/storage";
 import { convertFileSrc } from "@tauri-apps/api/core";
 import {
@@ -293,6 +293,16 @@ function createScreenshotEditorContext() {
 		}
 	});
 
+	const FPS = 60;
+	const FRAME_TIME = 1000 / FPS;
+
+	const doRenderUpdate = (config: ProjectConfiguration) => {
+		commands.updateScreenshotConfig(config, false);
+	};
+
+	const throttledRenderUpdate = throttle(doRenderUpdate, FRAME_TIME);
+	const trailingRenderUpdate = debounce(doRenderUpdate, FRAME_TIME + 16);
+
 	const saveConfig = debounce((config: ProjectConfiguration) => {
 		commands.updateScreenshotConfig(config, true);
 	}, 1000);
@@ -312,7 +322,8 @@ function createScreenshotEditorContext() {
 					annotations: unwrap(annotations),
 				};
 
-				commands.updateScreenshotConfig(config, false);
+				throttledRenderUpdate(config);
+				trailingRenderUpdate(config);
 				saveConfig(config);
 			},
 		),

apps/desktop/src/utils/tauri.ts

@@ -369,7 +369,6 @@ uploadProgressEvent: "upload-progress-event"
 
 /** user-defined types **/
 
-export type AllGpusInfo = { gpus: GpuInfoDiag[]; primaryGpuIndex: number | null; isMultiGpuSystem: boolean; hasDiscreteGpu: boolean }
 export type Annotation = { id: string; type: AnnotationType; x: number; y: number; width: number; height: number; strokeColor: string; strokeWidth: number; fillColor: string; opacity: number; rotation: number; text: string | null; maskType?: MaskType | null; maskLevel?: number | null }
 export type AnnotationType = "arrow" | "circle" | "rectangle" | "text" | "mask"
 export type AppTheme = "system" | "light" | "dark"
@@ -438,7 +437,6 @@ quality: number | null;
  * Whether to prioritize speed over quality (default: false)
  */
 fast: boolean | null }
-export type GpuInfoDiag = { vendor: string; description: string; dedicatedVideoMemoryMb: number; adapterIndex: number; isSoftwareAdapter: boolean; isBasicRenderDriver: boolean; supportsHardwareEncoding: boolean }
 export type HapticPattern = "alignment" | "levelChange" | "generic"
 export type HapticPerformanceTime = "default" | "now" | "drawCompleted"
 export type Hotkey = { code: string; meta: boolean; ctrl: boolean; alt: boolean; shift: boolean }
@@ -451,6 +449,7 @@ export type JsonValue<T> = [T]
 export type LogicalBounds = { position: LogicalPosition; size: LogicalSize }
 export type LogicalPosition = { x: number; y: number }
 export type LogicalSize = { width: number; height: number }
+export type MacOSVersionInfo = { displayName: string }
 export type MainWindowRecordingStartBehaviour = "close" | "minimise"
 export type MaskKeyframes = { position?: MaskVectorKeyframe[]; size?: MaskVectorKeyframe[]; intensity?: MaskScalarKeyframe[] }
 export type MaskKind = "sensitive" | "highlight"
@@ -493,7 +492,6 @@ export type RecordingStatus = "pending" | "recording"
 export type RecordingStopped = null
 export type RecordingTargetMode = "display" | "window" | "area"
 export type RenderFrameEvent = { frame_number: number; fps: number; resolution_base: XY<number> }
-export type RenderingStatus = { isUsingSoftwareRendering: boolean; isUsingBasicRenderDriver: boolean; hardwareEncodingAvailable: boolean; warningMessage: string | null }
 export type RequestOpenRecordingPicker = { target_mode: RecordingTargetMode | null }
 export type RequestOpenSettings = { page: string }
 export type RequestScreenCapturePrewarm = { force?: boolean }
@@ -514,7 +512,7 @@ export type StartRecordingInputs = { capture_target: ScreenCaptureTarget; captur
 export type StereoMode = "stereo" | "monoL" | "monoR"
 export type StudioRecordingMeta = { segment: SingleSegment } | { inner: MultipleSegments }
 export type StudioRecordingStatus = { status: "InProgress" } | { status: "NeedsRemux" } | { status: "Failed"; error: string } | { status: "Complete" }
-export type SystemDiagnostics = { windowsVersion: WindowsVersionInfo | null; gpuInfo: GpuInfoDiag | null; allGpus: AllGpusInfo | null; renderingStatus: RenderingStatus; availableEncoders: string[]; graphicsCaptureSupported: boolean; d3D11VideoProcessorAvailable: boolean }
+export type SystemDiagnostics = { macosVersion: MacOSVersionInfo | null; availableEncoders: string[]; screenCaptureSupported: boolean }
 export type TargetUnderCursor = { display_id: DisplayId | null; window: WindowUnderCursor | null }
 export type TextSegment = { start: number; end: number; enabled?: boolean; content?: string; center?: XY<number>; size?: XY<number>; fontFamily?: string; fontSize?: number; fontWeight?: number; italic?: boolean; color?: string; fadeDuration?: number }
 export type TimelineConfiguration = { segments: TimelineSegment[]; zoomSegments: ZoomSegment[]; sceneSegments?: SceneSegment[]; maskSegments?: MaskSegment[]; textSegments?: TextSegment[] }
@@ -531,7 +529,6 @@ export type VideoUploadInfo = { id: string; link: string; config: S3UploadMeta }
 export type WindowExclusion = { bundleIdentifier?: string | null; ownerName?: string | null; windowTitle?: string | null }
 export type WindowId = string
 export type WindowUnderCursor = { id: WindowId; app_name: string; bounds: LogicalBounds }
-export type WindowsVersionInfo = { major: number; minor: number; build: number; displayName: string; meetsRequirements: boolean; isWindows11: boolean }
 export type XY<T> = { x: T; y: T }
 export type ZoomMode = "auto" | { manual: { x: number; y: number } }
 export type ZoomSegment = { start: number; end: number; amount: number; mode: ZoomMode }

apps/web/content/changelog/76.mdx

@@ -1,7 +1,7 @@
 ---
 title: Editor playback stability & bug fixes
 app: Cap Desktop
-publishedAt: “2025-10-19”
+publishedAt: "2025-10-19"
 version: 0.3.75
 image:
 ---

apps/web/content/changelog/77.mdx

@@ -1,7 +1,7 @@
 ---
 title: Video upload improvements
 app: Cap Desktop
-publishedAt: “2025-10-21”
+publishedAt: "2025-10-21"
 version: 0.3.76
 image:
 ---

apps/web/content/changelog/78.mdx

@@ -1,7 +1,7 @@
 ---
 title: Instant Mode resolution picker + Improvements to audio and uploader
 app: Cap Desktop
-publishedAt: “2025-10-23”
+publishedAt: "2025-10-23"
 version: 0.3.77
 image:
 ---

apps/web/content/changelog/79.mdx

@@ -1,7 +1,7 @@
 ---
 title: Recording fixes + Editor enhancements
 app: Cap Desktop
-publishedAt: “2025-10-23”
+publishedAt: "2025-10-23"
 version: 0.3.78
 image:
 ---