[*] refactor

Author: heng30

lib/video-editor/src/filters/subtitle/style.rs

@@ -43,6 +43,9 @@ pub struct SubtitleStyle {
 
     pub font_path: PathBuf,
 
+    #[derivative(Default(value = "String::new()"))]
+    pub font_family: String,
+
     pub background_color: Option<Rgba<u8>>,
 
     #[derivative(Default(value = "Some(Rgba([255, 255, 255, 255]))"))]

lib/video-editor/src/filters/subtitle/style/font_path.rs

@@ -9,13 +9,16 @@ use std::path::PathBuf;
 pub struct FontPathFilter {
     #[derivative(Default(value = "PathBuf::from(\"\")"))]
     pub font_path: PathBuf,
+
+    #[derivative(Default(value = "String::new()"))]
+    pub font_family: String,
 }
 
 impl FontPathFilter {
     pub const NAME: &'static str = "font path";
 
-    pub fn new(font_path: PathBuf) -> Self {
-        Self { font_path }
+    pub fn new(font_path: PathBuf, font_family: String) -> Self {
+        Self { font_path, font_family }
     }
 }
 
@@ -24,5 +27,6 @@ impl SubtitleFilter for FontPathFilter {
 
     fn apply(&self, style: &mut SubtitleStyle) {
         style.font_path = self.font_path.clone();
+        style.font_family = self.font_family.clone();
     }
 }

todo.md

@@ -1,12 +1,8 @@
 ## 问题
-- subtitle需要重新设计
-
-- preview相关界面中，没有filter的也会进入编辑模式
+- 添加字幕文件时需要给每个segment添加默认filter
+- subtile设置的字体没有显示
 
 ## 待验证
-- 选中的font没有显示在字体列表中
-- 选中segment边框颜色不能写，可以增加边框宽度
-- font列表刷新成功应该显示toast
 
 - 视频轨道分离字幕
 

wayshot/src/logic/video_editor/common_type.rs

@@ -174,6 +174,8 @@ pub struct MarkedFiltersConfig {
 pub struct FontStyleConfig {
     pub font_path: String,
 
+    pub font_family: String,
+
     #[derivative(Default(value = "20"))]
     pub font_size: i32,
 
@@ -221,6 +223,7 @@ impl From<UIFontStyle> for FontStyleConfig {
     fn from(ui: UIFontStyle) -> Self {
         Self {
             font_path: ui.font_path.font_path.into(),
+            font_family: ui.font_path.font_family.into(),
             font_size: ui.font_size.font_size,
             padding: ui.padding.padding,
             margin_vertical: ui.margin_vertical.margin,
@@ -253,6 +256,7 @@ impl From<FontStyleConfig> for UIFontStyle {
         Self {
             font_path: FontPathDetail {
                 font_path: config.font_path.into(),
+                font_family: config.font_family.into(),
             },
             font_size: FontSizeDetail {
                 font_size: config.font_size,

wayshot/src/logic/video_editor/filters/conversion.rs

@@ -584,6 +584,7 @@ impl From<FontPathFilter> for UIFontPathDetail {
     fn from(f: FontPathFilter) -> Self {
         Self {
             font_path: f.font_path.to_string_lossy().to_string().into(),
+            font_family: f.font_family.into(),
         }
     }
 }
@@ -592,6 +593,7 @@ impl From<UIFontPathDetail> for FontPathFilter {
     fn from(d: UIFontPathDetail) -> Self {
         Self {
             font_path: PathBuf::from(d.font_path.as_str()),
+            font_family: d.font_family.as_str().into(),
         }
     }
 }

wayshot/src/logic/video_editor/filters/subtitle.rs

@@ -298,6 +298,7 @@ fn extract_font_style_from_filters(filters: &[Arc<SubtitleFilterWrapper>]) -> Fo
         if filter_name == FontPathFilter::NAME {
             if let Some(f) = filter.as_any().downcast_ref::<FontPathFilter>() {
                 config.font_path = f.font_path.to_string_lossy().to_string();
+                config.font_family = f.font_family.clone();
             }
         } else if filter_name == FontSizeFilter::NAME {
             if let Some(f) = filter.as_any().downcast_ref::<FontSizeFilter>() {

wayshot/src/logic/video_editor/preview.rs

@@ -211,26 +211,31 @@ fn update_edit_mode_for_seek(ui: &AppWindow, position: Duration) {
         return;
     }
 
-    // Find the segment under the playhead first
-    let segment_under_playhead = with_history_manager(|state| {
-        for (track_idx, track) in state.tracks_manager.iter().enumerate() {
-            for (seg_idx, segment) in track.segments().iter().enumerate() {
-                let seg_start = segment.timeline_offset;
-                let seg_end = seg_start + segment.duration;
-                if position >= seg_start && position < seg_end {
-                    return Some((track_idx, seg_idx));
+    let edited_track_index = global_store!(ui).get_video_editor_current_edited_track_index();
+
+    let edited_segment_at_position = if edited_track_index >= 0 {
+        with_history_manager(|state| {
+            if let Some(track) = state.tracks_manager.iter().nth(edited_track_index as usize) {
+                for (seg_idx, segment) in track.segments().iter().enumerate() {
+                    let seg_start = segment.timeline_offset;
+                    let seg_end = seg_start + segment.duration;
+                    if position >= seg_start && position < seg_end {
+                        return Some((edited_track_index as usize, seg_idx));
+                    }
                 }
             }
-        }
+            None
+        })
+    } else {
         None
-    });
+    };
 
-    // Check if the segment under playhead is selected
-    let is_edit_mode = if let Some((track_idx, seg_idx)) = segment_under_playhead {
+    // Check if the edited segment is selected
+    let is_edit_mode = if let Some((track_idx, seg_idx)) = edited_segment_at_position {
         let selected_segments = get_selected_segment_indices(ui);
         selected_segments.contains(&(track_idx, seg_idx))
     } else {
-        false
+        false // Edited track has no segment at this position
     };
 
     global_ve_filter!(ui).set_is_in_edit_mode(is_edit_mode);

wayshot/src/logic/video_editor/subtitle.rs

@@ -119,9 +119,10 @@ fn create_filters_from_font_style(config: &FontStyleConfig) -> Vec<Box<dyn Subti
     let mut filters: Vec<Box<dyn SubtitleFilter>> = Vec::new();
 
     if !config.font_path.is_empty() {
-        filters.push(Box::new(FontPathFilter::new(PathBuf::from(
-            &config.font_path,
-        ))));
+        filters.push(Box::new(FontPathFilter::new(
+            PathBuf::from(&config.font_path),
+            config.font_family.clone(),
+        )));
     }
 
     if config.font_size > 0 {

wayshot/ui/panel/desktop/video-editor/filter.slint

@@ -236,6 +236,7 @@ export struct BackgroundColorDetail {
 }
 
 export struct FontPathDetail {
+    font-family: string,
     font-path: string,
 }
 

wayshot/ui/panel/desktop/video-editor/preview/preview-crop-layers.slint

@@ -29,6 +29,12 @@ export component PreviewCropLayers inherits Rectangle {
             width: img.width;
             height: img.height;
 
+            TouchArea {
+                scroll-event(event) => {
+                    accept
+                }
+            }
+
             img := Image {
                 private property <length> parent-width: rec.width;
                 private property <length> parent-height: rec.height;