[*] refactor video editor

Author: heng30

lib/video-editor/src/filters.rs

@@ -1,5 +1,7 @@
 pub mod audio;
+pub mod graph;
 pub mod subtitle;
+pub mod text;
 pub mod traits;
 pub mod video;
 

lib/video-editor/src/filters/graph.rs

@@ -0,0 +1,12 @@
+pub mod draw_circle;
+pub mod draw_rectangle;
+
+pub use draw_circle::*;
+pub use draw_rectangle::*;
+
+pub fn all_filter_names() -> &'static [&'static str] {
+    &[
+        draw_circle::DrawCircleFilter::NAME,
+        draw_rectangle::DrawRectangleFilter::NAME,
+    ]
+}

…-editor/src/filters/video/draw_circle.rs …-editor/src/filters/graph/draw_circle.rslib/video-editor/src/filters/video/draw_circle.rs renamed to lib/video-editor/src/filters/graph/draw_circle.rs lib/video-editor/src/filters/video/draw_circle.rs renamed to lib/video-editor/src/filters/graph/draw_circle.rs

@@ -58,7 +58,7 @@ pub struct DrawCircleFilter {
 }
 
 impl DrawCircleFilter {
-    pub const NAME: &'static str = "draw_circle";
+    pub const NAME: &'static str = "draw circle";
 
     pub fn new(center_x: f32, center_y: f32, radius: u32) -> Self {
         Self {

…itor/src/filters/video/draw_rectangle.rs …itor/src/filters/graph/draw_rectangle.rslib/video-editor/src/filters/video/draw_rectangle.rs renamed to lib/video-editor/src/filters/graph/draw_rectangle.rs lib/video-editor/src/filters/video/draw_rectangle.rs renamed to lib/video-editor/src/filters/graph/draw_rectangle.rs

@@ -299,8 +299,9 @@ impl DrawRectangleFilter {
                     let aa_range = 1.5;
 
                     // 判断是在填充区还是边框区
-                    let in_fill = inner_w > 0.0 && inner_h > 0.0 &&
-                        Self::inside_rounded_rect(fx - bw, fy - bw, inner_w, inner_h, inner_r);
+                    let in_fill = inner_w > 0.0
+                        && inner_h > 0.0
+                        && Self::inside_rounded_rect(fx - bw, fy - bw, inner_w, inner_h, inner_r);
 
                     if in_fill {
                         // 填充区：检查是否靠近内边界
@@ -460,7 +461,9 @@ impl DrawRectangleFilter {
                 }
             } else {
                 // Rounded rectangle with border support
-                let fill_rgba = self.fill_color.map(|f| Rgba(apply_opacity(f)))
+                let fill_rgba = self
+                    .fill_color
+                    .map(|f| Rgba(apply_opacity(f)))
                     .unwrap_or(Rgba([0, 0, 0, 0]));
 
                 Self::draw_rounded_rectangle_with_border(

lib/video-editor/src/filters/text/font.rs

@@ -4,8 +4,6 @@ pub mod color_balance;
 pub mod contrast;
 pub mod crop;
 pub mod cross_dissolve;
-pub mod draw_circle;
-pub mod draw_rectangle;
 pub mod fade_in;
 pub mod fade_out;
 pub mod flip;
@@ -28,8 +26,6 @@ pub use color_balance::ColorBalanceFilter;
 pub use contrast::ContrastFilter;
 pub use crop::CropFilter;
 pub use cross_dissolve::CrossDissolveFilter;
-pub use draw_circle::DrawCircleFilter;
-pub use draw_rectangle::DrawRectangleFilter;
 pub use fade_in::FadeInFilter;
 pub use fade_out::FadeOutFilter;
 pub use flip::{FlipDirection, FlipFilter};
@@ -48,29 +44,27 @@ pub use zoom_out::ZoomOutFilter;
 
 pub fn all_filter_names() -> &'static [&'static str] {
     &[
+        TransformFilter::NAME,
+        WipeLeftToRightFilter::NAME,
+        WipeTopToBottomFilter::NAME,
+        SlideFromLeftFilter::NAME,
+        SlideFromTopFilter::NAME,
+        FlipFilter::NAME,
+        MovingFilter::NAME,
+        ZoomFilter::NAME,
+        ZoomInFilter::NAME,
+        ZoomOutFilter::NAME,
+        FadeInFilter::NAME,
+        FadeOutFilter::NAME,
         BrightnessFilter::NAME,
         ChromaKeyFilter::NAME,
         ColorBalanceFilter::NAME,
         ContrastFilter::NAME,
         CropFilter::NAME,
         CrossDissolveFilter::NAME,
-        DrawCircleFilter::NAME,
-        DrawRectangleFilter::NAME,
-        FadeInFilter::NAME,
-        FadeOutFilter::NAME,
-        FlipFilter::NAME,
         GaussianBlurFilter::NAME,
-        MovingFilter::NAME,
         SaturationFilter::NAME,
         SharpenFilter::NAME,
-        SlideFromLeftFilter::NAME,
-        SlideFromTopFilter::NAME,
-        TransformFilter::NAME,
-        WipeLeftToRightFilter::NAME,
-        WipeTopToBottomFilter::NAME,
-        ZoomFilter::NAME,
-        ZoomInFilter::NAME,
-        ZoomOutFilter::NAME,
     ]
 }
 

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

@@ -287,6 +287,14 @@ pub fn init(ui: &AppWindow) {
                     let index = user_data.parse::<i32>().unwrap();
                     global_ve_filter!(ui).invoke_down_filter(index);
                 }
+                "video-editor-move-to-top-filter" => {
+                    let index = user_data.parse::<i32>().unwrap();
+                    global_ve_filter!(ui).invoke_move_to_top_filter(index);
+                }
+                "video-editor-move-to-bottom-filter" => {
+                    let index = user_data.parse::<i32>().unwrap();
+                    global_ve_filter!(ui).invoke_move_to_bottom_filter(index);
+                }
                 "video-editor-remove-filter" => {
                     let index = user_data.parse::<i32>().unwrap();
                     global_ve_filter!(ui).invoke_remove_filter(index);

wayshot/src/logic/popup_action.rs

@@ -30,19 +30,17 @@ use video_editor::{
             FadeOutFilter as AudioFadeOutFilter, GainFilter, LimiterFilter, MuteLeftFilter,
             MuteRightFilter, NoiseGateFilter, NormalizeFilter,
         },
+        graph::{DrawCircleFilter, DrawRectangleFilter},
         subtitle::style::{
             AlignmentFilter, BackgroundColorFilter, BorderRadiusFilter, FontPathFilter,
             FontSizeFilter, MarginHorizontalFilter, MarginVerticalFilter, OutlineColorFilter,
             OutlineWidthFilter, PaddingFilter, PrimaryColorFilter,
         },
         video::{
-            BrightnessFilter, ChromaKeyFilter, ContrastFilter, CropFilter, DrawCircleFilter,
-            DrawRectangleFilter, FlipFilter, GaussianBlurFilter, SaturationFilter, SharpenFilter,
-            TransformFilter, ZoomFilter,
-        },
-        video::{
-            ColorBalanceFilter, CrossDissolveFilter, FadeInFilter, FadeOutFilter, MovingFilter,
-            SlideFromLeftFilter, SlideFromTopFilter, WipeLeftToRightFilter, WipeTopToBottomFilter,
+            BrightnessFilter, ChromaKeyFilter, ColorBalanceFilter, ContrastFilter, CropFilter,
+            CrossDissolveFilter, FadeInFilter, FadeOutFilter, FlipFilter, GaussianBlurFilter,
+            MovingFilter, SaturationFilter, SharpenFilter, SlideFromLeftFilter, SlideFromTopFilter,
+            TransformFilter, WipeLeftToRightFilter, WipeTopToBottomFilter, ZoomFilter,
             ZoomInFilter, ZoomOutFilter,
         },
     },

wayshot/src/logic/video_editor/conversion.rs

@@ -1,7 +1,6 @@
 mod audio;
 mod conversion;
 pub mod filter;
-mod overlay;
 mod subtitle;
 mod video;
 
@@ -12,5 +11,4 @@ pub fn init(ui: &crate::slint_generatedAppWindow::AppWindow) {
     video::init(ui);
     audio::init(ui);
     subtitle::init(ui);
-    overlay::init(ui);
 }

wayshot/src/logic/video_editor/filters.rs

@@ -23,16 +23,16 @@ use video_editor::filters::{
         CompressorFilter, FadeInFilter as AudioFadeInFilter, FadeOutFilter as AudioFadeOutFilter,
         GainFilter, LimiterFilter, NoiseGateFilter, NormalizeFilter,
     },
+    graph::{DrawCircleFilter, DrawRectangleFilter},
     subtitle::style::{
         AlignmentFilter, BackgroundColorFilter, BorderRadiusFilter, FontPathFilter, FontSizeFilter,
         MarginHorizontalFilter, MarginVerticalFilter, OutlineColorFilter, OutlineWidthFilter,
         PaddingFilter, PrimaryColorFilter,
     },
     video::{
-        ColorBalanceFilter, EasingFunction, MovingFilter,
-        BrightnessFilter, ChromaKeyFilter, ContrastFilter, CropFilter, DrawCircleFilter,
-        DrawRectangleFilter, FlipDirection, FlipFilter, GaussianBlurFilter, SaturationFilter,
-        SharpenFilter, TransformFilter, ZoomFilter,
+        BrightnessFilter, ChromaKeyFilter, ColorBalanceFilter, ContrastFilter, CropFilter,
+        EasingFunction, FlipDirection, FlipFilter, GaussianBlurFilter, MovingFilter,
+        SaturationFilter, SharpenFilter, TransformFilter, ZoomFilter,
     },
 };