Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
fix(desktop-gpui): preserve redo on unchanged caption and keyboard timing
Aditya Garud92ad15b73396
diff --git a/apps/desktop-gpui/src/editor_panels.rs b/apps/desktop-gpui/src/editor_panels.rsindex 4ad482e30..1a2f90041 100644--- a/apps/desktop-gpui/src/editor_panels.rs+++ b/apps/desktop-gpui/src/editor_panels.rs@@ -2897,12 +2897,7 @@ impl EditorWindow {};let start = matches!(key, FieldKey::CaptionStart(_));self.edit_caption_segment("caption-timing", index, window, cx, move |segment| {- if start {- segment.start = value;- } else {- segment.end = value;- }- true+ commit_segment_timing(segment, start, value)});}FieldKey::KeyboardStart(index) | FieldKey::KeyboardEnd(index) => {@@ -2914,12 +2909,7 @@ impl EditorWindow {};let start = matches!(key, FieldKey::KeyboardStart(_));self.edit_keyboard_segment("keyboard-timing", index, window, cx, move |segment| {- if start {- segment.start = value;- } else {- segment.end = value;- }- true+ commit_segment_timing(segment, start, value)});}FieldKey::SyncOffset(clip, kind) => {@@ -2975,6 +2965,27 @@ impl EditorWindow {}}+fn commit_segment_timing(+ segment: &mut impl crate::editor_edits::TrackSegmentOps,+ start: bool,+ value: f64,+) -> bool {+ let current = if start {+ segment.start()+ } else {+ segment.end()+ };+ if current == value {+ return false;+ }+ if start {+ segment.set_start(value);+ } else {+ segment.set_end(value);+ }+ true+}+// ---------------------------------------------------------------------------// Per-track edit helpers// ---------------------------------------------------------------------------@@ -7936,6 +7947,67 @@ impl EditorWindow {mod tests {use super::*;+ #[test]+ fn unchanged_timing_fields_preserve_redo() {+ use crate::editor_edits::ProjectHistory;++ for caption in [true, false] {+ for start in [true, false] {+ for paused in [true, false] {+ let mut project: cap_project::ProjectConfiguration =+ serde_json::from_value(serde_json::json!({+ "timeline": {+ "segments": [],+ "zoomSegments": [],+ "captionSegments": [{ "id": "caption", "start": 2., "end": 6., "text": "hello" }],+ "keyboardSegments": [{ "id": "keyboard", "start": 2., "end": 6., "displayText": "A", "keys": [] }]+ }+ }))+ .unwrap();+ let initial = serde_json::to_value(&project).unwrap();+ let mut history = ProjectHistory::new(project.clone());+ let commit = |project: &mut cap_project::ProjectConfiguration, value| {+ let timeline = project.timeline.as_mut().unwrap();+ if caption {+ commit_segment_timing(&mut timeline.caption_segments[0], start, value)+ } else {+ commit_segment_timing(&mut timeline.keyboard_segments[0], start, value)+ }+ };+ let before = if start { 2. } else { 6. };+ assert!(commit(&mut project, before + 1.));+ history.record(&project);+ let edited = serde_json::to_value(&project).unwrap();+ project = history.undo().unwrap().clone();+ assert_eq!(serde_json::to_value(&project).unwrap(), initial);++ if paused {+ history.pause();+ }+ if commit(&mut project, before) {+ history.record(&project);+ }+ if paused {+ history.resume(&project);+ }+ assert!(+ history.can_redo(),+ "caption={caption}, start={start}, paused={paused}"+ );+ assert!(!history.can_undo());+ assert_eq!(+ serde_json::to_value(history.redo().unwrap()).unwrap(),+ edited+ );+ assert_eq!(+ serde_json::to_value(history.undo().unwrap()).unwrap(),+ initial+ );+ }+ }+ }+ }+fn camera3d(start: f64, end: f64) -> Camera3DSegment {Camera3DSegment {start,