[*] refactor

Author: heng30

todo.md

@@ -1,5 +1,4 @@
 ## 问题
-- 预设滤镜列表中条目后面添加也给移除按钮，点击移除按钮，移除列表中的预设滤镜
 
 ## 待验证
 - 视频轨道分离字幕

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

@@ -133,6 +133,7 @@ pub fn init(ui: &AppWindow) {
     ve_filter_cb!(add_filter, ui, filter_name);
     ve_filter_cb!(create_preset_filter, ui, name);
     ve_filter_cb!(add_preset_filter, ui, filter);
+    ve_filter_cb!(remove_preset_filter, ui, index, filter_type);
     ve_filter_cb!(add_cache_preset_filter, ui, filter);
     ve_filter_cb!(remove_cache_preset_filter, ui, filter);
     ve_filter_cb!(toggle_mark_filter, ui, filter);
@@ -689,6 +690,38 @@ fn remove_cache_preset_filter(ui: &AppWindow, filter: UISegmentFilter) {
     ve_filter_cache_preset_filters!(ui).set_vec(new_cache);
 }
 
+pub fn remove_preset_filter(ui: &AppWindow, index: i32, filter_type: UIFilterType) {
+    let idx = index as usize;
+
+    match filter_type {
+        UIFilterType::Video => {
+            if idx < ve_filter_preset_filters!(ui, video).row_count() {
+                ve_filter_preset_filters!(ui, video).remove(idx);
+            }
+        }
+        UIFilterType::Audio => {
+            if idx < ve_filter_preset_filters!(ui, audio).row_count() {
+                ve_filter_preset_filters!(ui, audio).remove(idx);
+            }
+        }
+        UIFilterType::Subtitle => {
+            if idx < ve_filter_preset_filters!(ui, subtitle).row_count() {
+                ve_filter_preset_filters!(ui, subtitle).remove(idx);
+            }
+        }
+        UIFilterType::Image => {
+            if idx < ve_filter_preset_filters!(ui, image).row_count() {
+                ve_filter_preset_filters!(ui, image).remove(idx);
+            }
+        }
+    }
+
+    let config = collect_preset_filters_from_ui(ui);
+    save_preset_filters_to_db(ui.as_weak(), config);
+
+    crate::toast_success!(ui, "Preset filter removed");
+}
+
 fn toggle_mark_filter(ui: &AppWindow, filter: UIFilterEntry) {
     let filter_name = filter.name.to_string();
     let filter_type: UIFilterType = filter.ty;

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

@@ -296,6 +296,7 @@ export global VEFilter {
 
     callback create-preset-filter(name: string);
     callback add-preset-filter(filter: PresetFilter);
+    callback remove-preset-filter(index: int, filter-type: FilterType);
     callback add-cache-preset-filter(filter: SegmentFilter);
     callback remove-cache-preset-filter(filter: SegmentFilter);
 

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

@@ -153,6 +153,7 @@ component SegmentFilterList inherits Rectangle {
     private property <bool> preset-mode;
 
     callback clicked(filter: SegmentFilter);
+    callback filter-selected(ty: FilterType);
 
     changed selected-index => {
         if (selected-index == -1) {
@@ -254,6 +255,7 @@ component SegmentFilterList inherits Rectangle {
                             VEFilter.selected-filter = filter;
                             VEFilter.is-in-edit-mode = VEFilter.is-edit-mode-filter(filter.name);
                             Store.video-editor-segment-filter-flag = !Store.video-editor-segment-filter-flag;
+                            root.filter-selected(filter.ty);
                         }
                     }
                 }
@@ -374,6 +376,7 @@ component SegmentFilter inherits Rectangle {
 
     private property <VideoEditorTrackSegment> segment: Logic.video-editor-selected-segment(Store.video-editor-segment-selected-flag, Store.video-editor-segment-filter-flag);
     private property <SegmentFilter> selected-filter <=> VEFilter.selected-filter;
+    private property <bool> auto-switching-tab: false;
 
     // 例如通过界面调整了filter状态，但是selected-filter没有及时更新。导致状态不一致
     // 通过segment变化及时更新当前filter状态
@@ -390,7 +393,10 @@ component SegmentFilter inherits Rectangle {
         y: 0;
 
         changed checked-index => {
-            sl.selected-index = -1;
+            if (!auto-switching-tab) {
+                sl.selected-index = -1;
+            }
+            auto-switching-tab = false;
         }
 
         open-filters-selector(checked-index) => {
@@ -408,6 +414,17 @@ component SegmentFilter inherits Rectangle {
         y: tab.y + tab.height + Theme.spacing * 2;
         height: root.height - td.height - tab.height - rec.height;
         segment: root.segment;
+
+        filter-selected(ty) => {
+            auto-switching-tab = true;
+            if (ty == FilterType.Video) {
+                tab.checked-index = 0;
+            } else if (ty == FilterType.Audio) {
+                tab.checked-index = 1;
+            } else if (ty == FilterType.Image) {
+                tab.checked-index = 2;
+            }
+        }
     }
 
     td := MovingDivider {
@@ -462,6 +479,7 @@ component FilterSelector inherits VerticalLayout {
 
     callback clicked(entry: FilterEntry);
     callback preset-clicked(preset: PresetFilter);
+    callback remove-preset-clicked(index: int);
     callback back <=> back-icon.clicked;
 
     spacing: Theme.spacing;
@@ -569,15 +587,29 @@ component FilterSelector inherits VerticalLayout {
                 hbox2 := HorizontalLayout {
                     spacing: Theme.spacing * 4;
                     padding: Theme.padding * 2;
-                    alignment: start;
+                    alignment: space-between;
+
+                    HorizontalLayout {
+                        spacing: Theme.spacing * 4;
+                        alignment: start;
+
+                        Label {
+                            text: index + 1;
+                        }
 
-                    Label {
-                        text: index + 1;
+                        Label {
+                            text: preset.name;
+                            overflow: elide;
+                        }
                     }
 
-                    Label {
-                        text: preset.name;
-                        overflow: elide;
+                    IconBtn {
+                        icon: Icons.delete-light;
+                        show-icon-hover-background: false;
+
+                        clicked => {
+                            root.remove-preset-clicked(index);
+                        }
                     }
                 }
             }
@@ -622,6 +654,10 @@ export component Filter inherits Rectangle {
                 is-show-selector = false;
             }
 
+            remove-preset-clicked(index) => {
+                VEFilter.remove-preset-filter(index, FilterType.Video);
+            }
+
             back => {
                 is-show-selector = false;
             }
@@ -640,6 +676,10 @@ export component Filter inherits Rectangle {
                 is-show-selector = false;
             }
 
+            remove-preset-clicked(index) => {
+                VEFilter.remove-preset-filter(index, FilterType.Audio);
+            }
+
             back => {
                 is-show-selector = false;
             }
@@ -658,6 +698,10 @@ export component Filter inherits Rectangle {
                 is-show-selector = false;
             }
 
+            remove-preset-clicked(index) => {
+                VEFilter.remove-preset-filter(index, FilterType.Image);
+            }
+
             back => {
                 is-show-selector = false;
             }