[*] refactor: video-editor

heng30 · heng30 · commit 14eafdeaa30b · 2026-03-13T16:24:46.000+08:00
diff --git a/lib/video-editor/src/tracks/track.rs b/lib/video-editor/src/tracks/track.rs
@@ -279,6 +279,7 @@ impl Track {
                     segment.timeline_offset.checked_add(amount).ok_or_else(|| {
                         Error::InvalidConfig("Timeline offset overflow after shifting".to_string())
                     })?;
+                track.update_duration();
             }
             Track::Audio(track) => {
                 let track = Arc::make_mut(track);
@@ -287,6 +288,7 @@ impl Track {
                     segment.timeline_offset.checked_add(amount).ok_or_else(|| {
                         Error::InvalidConfig("Timeline offset overflow after shifting".to_string())
                     })?;
+                track.update_duration();
             }
             Track::Subtitle(track) => {
                 let track = Arc::make_mut(track);
@@ -295,6 +297,7 @@ impl Track {
                     segment.timeline_offset.checked_add(amount).ok_or_else(|| {
                         Error::InvalidConfig("Timeline offset overflow after shifting".to_string())
                     })?;
+                track.update_duration();
             }
             Track::Overlay(track) => {
                 let track = Arc::make_mut(track);
@@ -303,6 +306,7 @@ impl Track {
                     segment.timeline_offset.checked_add(amount).ok_or_else(|| {
                         Error::InvalidConfig("Timeline offset overflow after shifting".to_string())
                     })?;
+                track.update_duration();
             }
         }
         Ok(())
@@ -321,6 +325,7 @@ impl Track {
                     segment.timeline_offset.checked_sub(amount).ok_or_else(|| {
                         Error::InvalidConfig("Timeline offset underflow after shifting".to_string())
                     })?;
+                track.update_duration();
             }
             Track::Audio(track) => {
                 let track = Arc::make_mut(track);
@@ -329,6 +334,7 @@ impl Track {
                     segment.timeline_offset.checked_sub(amount).ok_or_else(|| {
                         Error::InvalidConfig("Timeline offset underflow after shifting".to_string())
                     })?;
+                track.update_duration();
             }
             Track::Subtitle(track) => {
                 let track = Arc::make_mut(track);
@@ -337,6 +343,7 @@ impl Track {
                     segment.timeline_offset.checked_sub(amount).ok_or_else(|| {
                         Error::InvalidConfig("Timeline offset underflow after shifting".to_string())
                     })?;
+                track.update_duration();
             }
             Track::Overlay(track) => {
                 let track = Arc::make_mut(track);
@@ -345,6 +352,7 @@ impl Track {
                     segment.timeline_offset.checked_sub(amount).ok_or_else(|| {
                         Error::InvalidConfig("Timeline offset underflow after shifting".to_string())
                     })?;
+                track.update_duration();
             }
         }
         Ok(())
@@ -724,6 +732,7 @@ impl Track {
             }
         }
 
+        Self::update_track_duration(self);
         Ok(())
     }
 
@@ -744,6 +753,7 @@ impl Track {
             }
         }
 
+        Self::update_track_duration(self);
         Ok(())
     }
 
diff --git a/lib/video-editor/tests/commands_test.rs b/lib/video-editor/tests/commands_test.rs
@@ -78,11 +78,11 @@ fn create_test_track() -> Track {
         name: String::default(),
         hiding: false,
         muted: false,
-        track: InnerTrack {
-            metadata: create_test_metadata(),
-            duration: Duration::from_secs(10),
-            segments: vec![create_test_segment(Duration::ZERO, Duration::from_secs(10))],
-        },
+        track: InnerTrack::new(
+            create_test_metadata(),
+            Duration::from_secs(10),
+            vec![create_test_segment(Duration::ZERO, Duration::from_secs(10))],
+        ),
     }))
 }
 
@@ -94,11 +94,11 @@ fn create_test_track_with_two_segments() -> Track {
         name: String::default(),
         hiding: false,
         muted: false,
-        track: InnerTrack {
-            metadata: create_test_metadata(),
-            duration: Duration::from_secs(10),
-            segments: vec![seg1, seg2],
-        },
+        track: InnerTrack::new(
+            create_test_metadata(),
+            Duration::from_secs(10),
+            vec![seg1, seg2],
+        ),
     }))
 }
 
diff --git a/lib/video-editor/tests/track_operations_test.rs b/lib/video-editor/tests/track_operations_test.rs
@@ -47,11 +47,11 @@ fn create_test_track() -> Track {
         name: String::default(),
         hiding: false,
         muted: false,
-        track: InnerTrack {
-            metadata: create_test_metadata(),
-            duration: Duration::from_secs(10),
-            segments: vec![create_test_segment(Duration::ZERO, Duration::from_secs(10))],
-        },
+        track: InnerTrack::new(
+            create_test_metadata(),
+            Duration::from_secs(10),
+            vec![create_test_segment(Duration::ZERO, Duration::from_secs(10))],
+        ),
     }))
 }
 
@@ -61,11 +61,11 @@ fn create_empty_track() -> Track {
         name: String::default(),
         hiding: false,
         muted: false,
-        track: InnerTrack {
-            metadata: create_test_metadata(),
-            duration: Duration::ZERO,
-            segments: vec![],
-        },
+        track: InnerTrack::new(
+            create_test_metadata(),
+            Duration::ZERO,
+            vec![],
+        ),
     }))
 }
 
diff --git a/todo.md b/todo.md
@@ -1,16 +1,11 @@
 ## 问题
 - 导出配置应该记住上一次导出的配置
-- 联动模式下，向右移动非最后一个segment，manager的时间没有正确更新
-- 跳转到上一个segment功能有问题，会跳转到第一个segment开始
-- 移动segment时，不应该保证playhead在可是区域。原因是调用了seek操作，刷新了flag，进行了回调。可以检测playhead.x变化来进行回调
 - playhead 在轨道中的中线长度有问题，如果轨道可以垂直轨道，中线上半部分会消失
 - 粘贴时如果playhead下没有segment，而且被粘贴的segment和后续的segment重合。如果启用了联动则，移动后续的segment，给被粘贴的segment挪位置。如果没有启动联动，则减少当前segment的长度，使其贴合下一个segment
 - 双击添加字幕轨道和overlay文件时, 轨道 应该放到最上方
-- 轨道头中，分离轨道，只能在视频轨道中启动，字幕轨道不应该启用
 - 分离音频后，原来轨道segment应该刷新UI显示，不应该显示声波
 - file -> close后，媒体库无法使用
 - file -> recent 弹框，没有历史应该显示：图片+文字
-- 新建项目的toast应该显示扩展名
 - file -> close 关闭项目会丢失最近历史。重启程序，最近历史也没有了
 
 - 两个相近的segment，中间有gap时，从前一个segment播放，到后一个segment开始部分画面会出现错乱
@@ -22,9 +17,10 @@
 - 轨道声音混合效果有问题，而且逻辑也有问题。没有重合部分声音也减低了
 - 字幕轨道有问题，添加字幕是没有按照字幕条目进行分割成segment，而且UI上也没有显示字幕文字
 - 联动模式下，如果改变一个segment的大小，后面的segment在UI上没有同步移动。等到松开鼠标才更新位置，不利于操作
-- 轨道列表要考虑下方的横向滚动条，添加更多的空间，可以改成总是显示更合适
 
 ## 待验证
+- 轨道头中，分离字幕轨道，只能在视频轨道中启动，字幕轨道不应该启用
+- 移动segment时，不应该保证playhead在可是区域。原因是调用了seek操作，刷新了flag，进行了回调。可以检测playhead.x变化来进行回调
 
 - 分离字幕
 
diff --git a/wayshot/src/logic/video_editor/preview.rs b/wayshot/src/logic/video_editor/preview.rs
@@ -70,7 +70,7 @@ fn video_editor_preview_jump_previous_segment(ui: &AppWindow) {
         let mut prev_start = None;
 
         'out: for track in state.tracks_manager.iter() {
-            for segment in track.segments() {
+            for segment in track.segments().iter().rev() {
                 if segment.timeline_offset < current_position {
                     prev_start = Some(segment.timeline_offset);
                     break 'out;
@@ -287,10 +287,6 @@ pub fn seek_to_position(ui: &AppWindow, position: Duration) {
                 return;
             }
 
-            global_store!(ui).set_video_editor_preivew_timeline_thumbnial_flag(
-                !global_store!(ui).get_video_editor_preivew_timeline_thumbnial_flag(),
-            );
-
             if let Some(frame) = renderer.current_frame() {
                 let img = rgba_image_to_slint(&frame);
                 global_store!(ui).set_video_editor_preview_image(img);
diff --git a/wayshot/src/logic/video_editor/project.rs b/wayshot/src/logic/video_editor/project.rs
@@ -234,7 +234,10 @@ fn video_editor_new_project(ui: &AppWindow, config: UIVideoEditorNewProjectConfi
 
         let mut path = dir.join(config.name.clone());
         path.set_extension(PROJECT_EXT);
-        let project_name = config.name.clone();
+        let project_name = path
+            .file_name()
+            .map(|f| f.to_string_lossy().to_string())
+            .unwrap_or_else(|| config.name.to_string());
         let preview_config: ProjectPreviewConfig = config.preview_config.clone().into();
 
         let (manager, playlist) = {
diff --git a/wayshot/ui/panel/desktop/video-editor/new-project.slint b/wayshot/ui/panel/desktop/video-editor/new-project.slint
@@ -36,6 +36,15 @@ component SettingPanle inherits SettingDetail {
         };
     }
 
+    fs-timer := Timer {
+        interval: 300ms;
+        running: true;
+        triggered() => {
+            name-li.focus();
+            self.running = false;
+        }
+    }
+
     SettingDetailInner {
         SettingDetailInnerVbox {
             SettingDetailLabel {
diff --git a/wayshot/ui/panel/desktop/video-editor/tracks/header.slint b/wayshot/ui/panel/desktop/video-editor/tracks/header.slint
@@ -79,7 +79,7 @@ export component TrackHead inherits Rectangle {
             user-data: index,
         },
         {
-            disable: !Logic.video-editor-contain-subtitle-track(index),
+            disable: !Logic.video-editor-contain-subtitle-track(index) || Logic.video-editor-is-subtitle-track(index),
             icon: Icons.detach2-light,
             text: Logic.tr("Detach Subtitle Track"),
             action: "video-editor-detach-subtitle-track",
diff --git a/wayshot/ui/panel/desktop/video-editor/tracks/segment.slint b/wayshot/ui/panel/desktop/video-editor/tracks/segment.slint
@@ -100,7 +100,6 @@ component Segment inherits Rectangle {
     private property <int> display-duration: is-active-drag ? Store.video-editor-drag-preview-duration : segment.duration;
 
     public function start-drag() {
-        Store.video-editor-segment-is-dragging = true;
         Store.video-editor-drag-segment-uuid = root.segment.uuid;
         Store.video-editor-drag-segment-track-index = root.track-index;
         Store.video-editor-drag-segment-index = root.index;
@@ -196,11 +195,14 @@ component Segment inherits Rectangle {
     ta := TouchArea {
         mouse-cursor: track-locked ? MouseCursor.not-allowed : MouseCursor.move;
 
+        private property <bool> right-button-pressed;
+
         pointer-event(event) => {
             if (track-locked) {
                 return;
             }
             if (event.button == PointerEventButton.right) {
+                right-button-pressed = true;
                 PopupActionSetting.show(self.absolute-position.x + self.mouse-x, self.absolute-position.y + self.mouse-y, segment-action-entries);
             } else if (event.button == PointerEventButton.left) {
                 if (event.kind == PointerEventKind.down) {
@@ -219,6 +221,8 @@ component Segment inherits Rectangle {
         }
 
         clicked => {
+            right-button-pressed = false;
+
             if (Store.video-editor-segment-is-dragging) {
                 return;
             }
@@ -236,7 +240,7 @@ component Segment inherits Rectangle {
         }
 
         moved => {
-            if (track-locked) {
+            if (track-locked || right-button-pressed) {
                 return;
             }
             // 使用绝对位置计算增量，避免因 segment 位置变化导致的抖动
diff --git a/wayshot/ui/panel/desktop/video-editor/tracks/timeline.slint b/wayshot/ui/panel/desktop/video-editor/tracks/timeline.slint
@@ -39,6 +39,10 @@ export component Timeline inherits Rectangle {
         Store.video-editor-timeline-flag = !Store.video-editor-timeline-flag;
     }
 
+    changed playhead-x => {
+        update-preview-timeline-offset();
+    }
+
     public function playhead-in-viewport() -> bool {
         return abs(flick.viewport-x) - playhead.handle-width / 2 < playhead.x && playhead.x < abs(flick.viewport-x) + flick.width;
     }
diff --git a/wayshot/ui/panel/desktop/video-editor/tracks/tracks.slint b/wayshot/ui/panel/desktop/video-editor/tracks/tracks.slint
@@ -76,16 +76,20 @@ component TracksList inherits Rectangle {
             vertical-scrollbar-policy: ScrollBarPolicy.always-off;
             horizontal-scrollbar-policy: ScrollBarPolicy.always-off;
 
-            for track[index] in tracks: LeftTrackHead {
-                init => {
-                    if (index == 0) {
-                        root.track-header-width = self.width;
+            for track[index] in tracks: VerticalLayout {
+                padding-bottom: segments-lv.viewport-width > segments-lv.width && index == tracks.length - 1 ? 15px : 0;
+
+                LeftTrackHead {
+                    init => {
+                        if (index == 0) {
+                            root.track-header-width = self.width;
+                        }
                     }
-                }
 
-                height: root.track-height(track.ty);
-                index: index;
-                track: track;
+                    height: root.track-height(track.ty);
+                    index: index;
+                    track: track;
+                }
             }
         }
 
@@ -189,11 +193,6 @@ export component Tracks inherits Rectangle {
                 header-width: tl.track-header-width;
                 timeline-width: tl.viewport-width;
 
-                private property <bool> update-preview-timeline-flag: Store.video-editor-preivew-timeline-thumbnial-flag;
-                changed update-preview-timeline-flag => {
-                    self.update-preview-timeline-offset();
-                }
-
                 moved => {
                     if (!self.playhead-in-viewport()) {
                         if (self.playhead-x < abs(tl.viewport-x)) {
diff --git a/wayshot/ui/store.slint b/wayshot/ui/store.slint
@@ -701,14 +701,13 @@ export global Store {
     in-out property <bool> video-editor-is-show-preference-setting-dialog;
     in-out property <bool> video-editor-is-unsaved;
     in-out property <bool> video-editor-is-previewing;
-    in-out property <bool> video-editor-preivew-timeline-thumbnial-flag; // 点击预览窗口下方的时间轴，触发下方轨道窗口的playhead在可视范围内
     in-out property <bool> video-editor-track-selected-flag; // 用于触发UI更新检查是否选中当前track
     in-out property <bool> video-editor-segment-selected-flag; // 用于触发UI更新检查是否选中当前segment
     in-out property <bool> video-editor-timeline-flag; // 用于触发时间轴UI更新
     in-out property <int> video-editor-timeline-offset;
 
     // 拖拽预览状态: 拖拽时只更新UI，释放时才提交到后台
-    in-out property <bool> video-editor-segment-is-dragging: false;
+    in-out property <bool> video-editor-segment-is-dragging;
     in-out property <string> video-editor-drag-segment-uuid: "";
     in-out property <int> video-editor-drag-preview-offset: 0;   // ms
     in-out property <int> video-editor-drag-preview-duration: 0; // ms

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,7 @@ impl Track {`
`279`	`279`	`segment.timeline_offset.checked_add(amount).ok_or_else(\|\| {`
`280`	`280`	`Error::InvalidConfig("Timeline offset overflow after shifting".to_string())`
`281`	`281`	`})?;`
	`282`	`+ track.update_duration();`
`282`	`283`	`}`
`283`	`284`	`Track::Audio(track) => {`
`284`	`285`	`let track = Arc::make_mut(track);`
`@@ -287,6 +288,7 @@ impl Track {`
`287`	`288`	`segment.timeline_offset.checked_add(amount).ok_or_else(\|\| {`
`288`	`289`	`Error::InvalidConfig("Timeline offset overflow after shifting".to_string())`
`289`	`290`	`})?;`
	`291`	`+ track.update_duration();`
`290`	`292`	`}`
`291`	`293`	`Track::Subtitle(track) => {`
`292`	`294`	`let track = Arc::make_mut(track);`
`@@ -295,6 +297,7 @@ impl Track {`
`295`	`297`	`segment.timeline_offset.checked_add(amount).ok_or_else(\|\| {`
`296`	`298`	`Error::InvalidConfig("Timeline offset overflow after shifting".to_string())`
`297`	`299`	`})?;`
	`300`	`+ track.update_duration();`
`298`	`301`	`}`
`299`	`302`	`Track::Overlay(track) => {`
`300`	`303`	`let track = Arc::make_mut(track);`
`@@ -303,6 +306,7 @@ impl Track {`
`303`	`306`	`segment.timeline_offset.checked_add(amount).ok_or_else(\|\| {`
`304`	`307`	`Error::InvalidConfig("Timeline offset overflow after shifting".to_string())`
`305`	`308`	`})?;`
	`309`	`+ track.update_duration();`
`306`	`310`	`}`
`307`	`311`	`}`
`308`	`312`	`Ok(())`
`@@ -321,6 +325,7 @@ impl Track {`
`321`	`325`	`segment.timeline_offset.checked_sub(amount).ok_or_else(\|\| {`
`322`	`326`	`Error::InvalidConfig("Timeline offset underflow after shifting".to_string())`
`323`	`327`	`})?;`
	`328`	`+ track.update_duration();`
`324`	`329`	`}`
`325`	`330`	`Track::Audio(track) => {`
`326`	`331`	`let track = Arc::make_mut(track);`
`@@ -329,6 +334,7 @@ impl Track {`
`329`	`334`	`segment.timeline_offset.checked_sub(amount).ok_or_else(\|\| {`
`330`	`335`	`Error::InvalidConfig("Timeline offset underflow after shifting".to_string())`
`331`	`336`	`})?;`
	`337`	`+ track.update_duration();`
`332`	`338`	`}`
`333`	`339`	`Track::Subtitle(track) => {`
`334`	`340`	`let track = Arc::make_mut(track);`
`@@ -337,6 +343,7 @@ impl Track {`
`337`	`343`	`segment.timeline_offset.checked_sub(amount).ok_or_else(\|\| {`
`338`	`344`	`Error::InvalidConfig("Timeline offset underflow after shifting".to_string())`
`339`	`345`	`})?;`
	`346`	`+ track.update_duration();`
`340`	`347`	`}`
`341`	`348`	`Track::Overlay(track) => {`
`342`	`349`	`let track = Arc::make_mut(track);`
`@@ -345,6 +352,7 @@ impl Track {`
`345`	`352`	`segment.timeline_offset.checked_sub(amount).ok_or_else(\|\| {`
`346`	`353`	`Error::InvalidConfig("Timeline offset underflow after shifting".to_string())`
`347`	`354`	`})?;`
	`355`	`+ track.update_duration();`
`348`	`356`	`}`
`349`	`357`	`}`
`350`	`358`	`Ok(())`
`@@ -724,6 +732,7 @@ impl Track {`
`724`	`732`	`}`
`725`	`733`	`}`
`726`	`734`
	`735`	`+ Self::update_track_duration(self);`
`727`	`736`	`Ok(())`
`728`	`737`	`}`
`729`	`738`
`@@ -744,6 +753,7 @@ impl Track {`
`744`	`753`	`}`
`745`	`754`	`}`
`746`	`755`
	`756`	`+ Self::update_track_duration(self);`
`747`	`757`	`Ok(())`
`748`	`758`	`}`
`749`	`759`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ export component TrackHead inherits Rectangle {`
`79`	`79`	`user-data: index,`
`80`	`80`	`},`
`81`	`81`	`{`
`82`		`- disable: !Logic.video-editor-contain-subtitle-track(index),`
	`82`	`+ disable: !Logic.video-editor-contain-subtitle-track(index) \|\| Logic.video-editor-is-subtitle-track(index),`
`83`	`83`	`icon: Icons.detach2-light,`
`84`	`84`	`text: Logic.tr("Detach Subtitle Track"),`
`85`	`85`	`action: "video-editor-detach-subtitle-track",`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ export component Timeline inherits Rectangle {`
`39`	`39`	`Store.video-editor-timeline-flag = !Store.video-editor-timeline-flag;`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ changed playhead-x => {`
	`43`	`+ update-preview-timeline-offset();`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`public function playhead-in-viewport() -> bool {`
`43`	`47`	`return abs(flick.viewport-x) - playhead.handle-width / 2 < playhead.x && playhead.x < abs(flick.viewport-x) + flick.width;`
`44`	`48`	`}`