[*] refactor

Author: heng30

lib/video-editor/src/font.rs

@@ -2,7 +2,7 @@ use crate::Result;
 use cosmic_text::fontdb;
 use std::path::PathBuf;
 
-pub fn get_fonts_info() -> Result<Vec<(String, PathBuf)>> {
+pub fn get_fonts_info() -> Result<Vec<(String, PathBuf, String)>> {
     let mut db = fontdb::Database::new();
     db.load_system_fonts();
 
@@ -13,7 +13,8 @@ pub fn get_fonts_info() -> Result<Vec<(String, PathBuf)>> {
             && let fontdb::Source::File(path) = &source
             && let Some(family) = face.families.first()
         {
-            fonts.push((family.0.clone(), path.clone()));
+            let style = format_font_style(face.weight, face.style);
+            fonts.push((family.0.clone(), path.clone(), style));
         }
     }
 
@@ -23,19 +24,53 @@ pub fn get_fonts_info() -> Result<Vec<(String, PathBuf)>> {
     Ok(fonts)
 }
 
-pub fn get_font_family_from_file(path: &PathBuf) -> Result<String> {
+fn format_font_style(weight: fontdb::Weight, style: fontdb::Style) -> String {
+    let weight_str = match weight {
+        fontdb::Weight::THIN => "Thin",
+        fontdb::Weight::EXTRA_LIGHT => "ExtraLight",
+        fontdb::Weight::LIGHT => "Light",
+        fontdb::Weight::NORMAL => "",
+        fontdb::Weight::MEDIUM => "Medium",
+        fontdb::Weight::SEMIBOLD => "SemiBold",
+        fontdb::Weight::BOLD => "Bold",
+        fontdb::Weight::EXTRA_BOLD => "ExtraBold",
+        fontdb::Weight::BLACK => "Black",
+        _ => "",
+    };
+
+    let style_str = match style {
+        fontdb::Style::Normal => "",
+        fontdb::Style::Italic => "Italic",
+        fontdb::Style::Oblique => "Oblique",
+    };
+
+    if weight_str.is_empty() && style_str.is_empty() {
+        "Normal".to_string()
+    } else if weight_str.is_empty() {
+        style_str.to_string()
+    } else if style_str.is_empty() {
+        weight_str.to_string()
+    } else {
+        format!("{} {}", weight_str, style_str)
+    }
+}
+
+pub fn get_font_family_from_file(path: &PathBuf) -> Result<(String, String)> {
     let mut db = fontdb::Database::new();
     db.load_font_file(path.clone())?;
 
     for face in db.faces() {
         if let Some(family) = face.families.first() {
-            return Ok(family.0.clone());
+            let style = format_font_style(face.weight, face.style);
+            return Ok((family.0.clone(), style));
         }
     }
 
-    Ok(path
-        .file_stem()
-        .and_then(|s| s.to_str())
-        .unwrap_or("Unknown")
-        .to_string())
+    Ok((
+        path.file_stem()
+            .and_then(|s| s.to_str())
+            .unwrap_or("Unknown")
+            .to_string(),
+        "Normal".to_string(),
+    ))
 }

todo.md

@@ -1,11 +1,10 @@
 ## 问题
 - subtitle需要重新设计
 
-- fly in preview显示时机有问题
+- 选中的font没有显示在字体列表中
 - fly in filter参数面板暂停时会恢复默认值
 
 ## 待验证
-- color picker弹出时需要设置现有的颜色
 - font 列表显示有问题，条目变少了。刷新时有275条，但是显示时却只有254条
 
 - 视频轨道分离字幕

wayshot/src/db.rs

@@ -222,6 +222,7 @@ pub struct FontEntry {
     pub id: String,
     pub family: String,
     pub path: String,
+    pub style: String,
     pub marked: bool,
     pub source: FontSource,
 }

wayshot/src/logic/video_editor/conversion.rs

@@ -896,6 +896,11 @@ pub fn video_filter_to_json_detail(filter: &Box<dyn VideoFilter>) -> String {
                 return serde_json::to_string(f).unwrap_or_default();
             }
         }
+        FlyInFilter::NAME => {
+            if let Some(f) = filter.as_any().downcast_ref::<FlyInFilter>() {
+                return serde_json::to_string(f).unwrap_or_default();
+            }
+        }
         _ => {}
     }
     String::new()

wayshot/src/logic/video_editor/font.rs

@@ -91,14 +91,15 @@ async fn refresh_font_entries_impl(ui_weak: Weak<AppWindow>) {
 
     let mut font_entries: Vec<FontEntry> = Vec::new();
 
-    for (family, path) in system_fonts {
+    for (family, path, style) in system_fonts {
         let path_str = path.to_string_lossy().to_string();
         let marked = marked_paths.contains(&path_str);
 
         let entry = FontEntry {
             id: path_str.clone(),
             family,
             path: path_str,
+            style,
             marked,
             source: FontSource::System,
         };
@@ -173,7 +174,7 @@ fn import_font_files(ui: &AppWindow) {
 }
 
 async fn import_font_to_db(ui_weak: Weak<AppWindow>, file_path: PathBuf) -> Option<FontEntry> {
-    let family = match get_font_family_from_file(&file_path) {
+    let (family, style) = match get_font_family_from_file(&file_path) {
         Ok(f) => f,
         Err(e) => {
             toast::async_toast_warn(
@@ -190,6 +191,7 @@ async fn import_font_to_db(ui_weak: Weak<AppWindow>, file_path: PathBuf) -> Opti
         id: path_str.clone(),
         family,
         path: path_str,
+        style,
         marked: true,
         source: FontSource::Imported,
     };

wayshot/ui/panel/desktop/font-dialog.slint

@@ -108,7 +108,9 @@ component FontItem inherits Rectangle {
     in property <int> index;
     in property <FontEntry> entry;
     in-out property <length> family-width;
+    in-out property <length> style-width;
     out property <length> family-preferred-width <=> family-lb.preferred-width;
+    out property <length> style-preferred-width <=> style-lb.preferred-width;
 
     background: ta.has-hover ? Theme.checked-background : (Math.mod(index, 2) == 0 ? Theme.table-item-first : Theme.table-item-second);
 
@@ -148,6 +150,13 @@ component FontItem inherits Rectangle {
             width: root.family-width;
         }
 
+        style-lb := Label {
+            text: entry.style;
+            color: Theme.secondary-text-color;
+            horizontal-alignment: left;
+            width: root.style-width;
+        }
+
         Label {
             text: entry.path;
             font-size: Theme.default-font-size * 0.8;
@@ -200,15 +209,18 @@ export component FontDialog inherits MovingDialog {
                     alignment: start;
 
                     private property <length> font-item-max-family-width;
+                    private property <length> font-item-max-style-width;
 
                     for entry[index] in Store.font-entries: FontItem {
                         index: index;
                         entry: entry;
                         height: font-item-height;
                         family-width: parent.font-item-max-family-width;
+                        style-width: parent.font-item-max-style-width;
 
                         init => {
                             parent.font-item-max-family-width = max(parent.font-item-max-family-width, self.family-preferred-width);
+                            parent.font-item-max-style-width = max(parent.font-item-max-style-width, self.style-preferred-width);
                         }
                     }
                 }

wayshot/ui/panel/desktop/video-editor/right-panel/filter/subtitle/font-path.slint

@@ -4,6 +4,7 @@ import {
     Icons,
     Util,
     Store,
+    FontEntry,
 } from "../../../../../def.slint";
 import {
     Label,
@@ -19,11 +20,11 @@ import {
 
 export component FontPath inherits Rectangle {
     in-out property <FontPathDetail> config;
-    private property <string> selected-font-path <=> Store.selected-font-entry.path;
+    private property <FontEntry> selected-font <=> Store.selected-font-entry;
 
-    changed selected-font-path => {
+    changed selected-font => {
         font-li.text = Util.file-name(config.font-path);
-        config.font-path = selected-font-path;
+        config.font-path = selected-font.path;
         self.apply(config);
     }
 

wayshot/ui/store.slint

@@ -620,6 +620,7 @@ export struct FontEntry {
     id: string,
     family: string,
     path: string,
+    style: string,
     marked: bool,
     source: FontSource,
 }