[*] refactor

Author: heng30

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

@@ -4,7 +4,6 @@ use crate::{
     tracks::video_frame_cache::VideoImage,
 };
 use image::{RgbaImage, imageops};
-use rayon::prelude::*;
 use video_utils::convert::resize_rgba_image_contain;
 
 #[derive(
@@ -108,8 +107,6 @@ impl CropFilter {
         Ok(())
     }
 
-    /// Apply circular crop with anti-aliasing for smooth edges.
-    /// The circle/ellipse is centered within the crop bounds and scaled to fill the area.
     fn apply_circular_crop(
         &self,
         image: &mut RgbaImage,
@@ -120,57 +117,39 @@ impl CropFilter {
         target_width: u32,
         target_height: u32,
     ) -> Result<()> {
-        // 1. Extract the rectangular crop region
+        // 1. Crop the rectangular region first
         let cropped = imageops::crop(image, px_left, px_top, px_width, px_height);
-        let cropped_image = cropped.to_image();
-
-        // 2. Resize cropped image to target dimensions (same as rectangle crop)
-        let resized = resize_rgba_image_contain(cropped_image, target_width, target_height, false)?;
-
-        // 3. Create output image
-        let mut result = RgbaImage::new(target_width, target_height);
-
-        // 4. Calculate circle parameters based on TARGET size
-        let center_x = target_width as f32 / 2.0;
-        let center_y = target_height as f32 / 2.0;
-        // For true circle shape, use minimum dimension
-        let min_radius = (target_width as f32 / 2.0).min(target_height as f32 / 2.0);
-        let radius_x = min_radius;
-        let radius_y = min_radius;
-
-        // 5. Anti-aliasing edge distance
-        let aa_edge_distance = 1.0;
-
-        // 6. Sample from resized image and apply circular mask
-        result
-            .par_enumerate_pixels_mut()
-            .for_each(|(px, py, pixel)| {
-                // Get source pixel from resized image (same coordinates)
-                let src_pixel = resized.get_pixel(px, py);
-
-                // Check if inside the circle
-                let dx = px as f32 - center_x;
-                let dy = py as f32 - center_y;
-                let ellipse_dist = (dx * dx) / (radius_x * radius_x) + (dy * dy) / (radius_y * radius_y);
-
-                if ellipse_dist <= 1.0 - aa_edge_distance / min_radius {
-                    // Fully inside the circle
-                    *pixel = *src_pixel;
-                } else if ellipse_dist <= 1.0 + aa_edge_distance / min_radius {
-                    // Anti-aliasing zone
-                    let aa_factor = (1.0 - (ellipse_dist - 1.0) * min_radius / aa_edge_distance)
-                        .clamp(0.0, 1.0);
-                    pixel[0] = src_pixel[0];
-                    pixel[1] = src_pixel[1];
-                    pixel[2] = src_pixel[2];
-                    pixel[3] = ((src_pixel[3] as f32 * aa_factor) as u8).min(src_pixel[3]);
-                } else {
-                    // Outside the circle - transparent
-                    pixel[3] = 0;
+        let mut cropped_image = cropped.to_image();
+
+        // 2. Calculate circle parameters (use center of the cropped region)
+        let cx = px_width as f32 / 2.0;
+        let cy = px_height as f32 / 2.0;
+        let radius = px_width.min(px_height) as f32 / 2.0;
+
+        // 3. Apply circular mask (pixels outside circle become transparent)
+        for y in 0..px_height {
+            for x in 0..px_width {
+                let dx = x as f32 - cx;
+                let dy = y as f32 - cy;
+                let dist = (dx * dx + dy * dy).sqrt();
+
+                if dist > radius {
+                    // Outside circle: set transparent
+                    let pixel = cropped_image.get_pixel_mut(x, y);
+                    pixel[3] = 0; // alpha = 0
+                } else if dist > radius - 1.0 {
+                    // Edge: apply anti-aliasing
+                    let alpha = (radius - dist).clamp(0.0, 1.0);
+                    let pixel = cropped_image.get_pixel_mut(x, y);
+                    pixel[3] = (pixel[3] as f32 * alpha) as u8;
                 }
-            });
+            }
+        }
+
+        // 4. Resize to target dimensions
+        *image = resize_rgba_image_contain(cropped_image, target_width, target_height, false)?;
+        // *image = cropped_image;
 
-        *image = result;
         Ok(())
     }
 }

todo.md

@@ -1,11 +1,10 @@
 ## 问题
-- segment 向右拖拽时，segment时长肯发生跳变
+- segment 向右拖拽时，segment长度有时会发生跳变。检查有哪些缓存变量没有及时更新，导致segment长度跳变
+
 - 焦点获取问题，很多地方或获取程序焦点，导致快捷键无法成功使用
 
 - 圆形裁剪有问题，现在是椭圆形，不是圆形。宽和高不一致。
 
-- 点击tool.slint中转录按钮，跳转到transcribe tab时，还是处于`打开或恢复历史`的页面。这个也要跳过才对
-
 ## 待验证
 
 

wayshot/src/logic/transcribe/model.rs

@@ -115,10 +115,13 @@ fn inner_init(ui: &AppWindow) {
     let config = config::all().transcribe;
     global_store!(ui).set_transcribe_setting(config.into());
 
-    let mut transcribe = UITranscribe::default();
-    transcribe.playing_index = -1;
-    transcribe.subtitles = ModelRc::new(VecModel::from_slice(&[]));
-    global_store!(ui).set_transcribe(transcribe);
+    let current = global_store!(ui).get_transcribe();
+    if current.file_path.is_empty() {
+        let mut transcribe = UITranscribe::default();
+        transcribe.playing_index = -1;
+        transcribe.subtitles = ModelRc::new(VecModel::from_slice(&[]));
+        global_store!(ui).set_transcribe(transcribe);
+    }
 
     let ui_weak = ui.as_weak();
     tokio::spawn(async move {

wayshot/src/logic/video_editor/common_type.rs

@@ -86,6 +86,9 @@ pub struct VideoEditorPreferenceTrackConfig {
     #[derivative(Default(value = "true"))]
     pub show_thumbnail: bool,
     pub show_filename: bool,
+
+    #[derivative(Default(value = "1.0"))]
+    pub audio_track_waveform_amplification: f32,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Derivative, SlintFromConvert)]

wayshot/src/logic/video_editor/track.rs

@@ -1150,8 +1150,8 @@ fn video_editor_transcribe_audio(ui: &AppWindow) {
                         ..Default::default()
                     };
 
-                    global_logic!(ui).invoke_switch_tab(UITabIndex::Transcribe);
                     global_store!(ui).set_transcribe(entry);
+                    global_logic!(ui).invoke_switch_tab(UITabIndex::Transcribe);
                     global_store!(ui).set_transcribe_audio_player_progress(0.0);
                     global_store!(ui).set_transcribe_audio_player_is_playing(false);
                     global_logic!(ui).invoke_transcribe_show_setting_dialog();

wayshot/ui/panel/desktop/home.slint

@@ -38,13 +38,13 @@ export component Home inherits VerticalLayout {
         }
     }
 
-    if Store.current-tab-index == TabIndex.Transcribe: TranscribePanel {
-        height: parent.height;
-
-        init => {
-            Logic.startup-transcribe-init();
-        }
-    }
+    // if Store.current-tab-index == TabIndex.Transcribe: TranscribePanel {
+    //     height: parent.height;
+    //
+    //     init => {
+    //         Logic.startup-transcribe-init();
+    //     }
+    // }
 
     //
     // if Store.current-tab-index == TabIndex.ShareScreen: ShareScreenPanel {

wayshot/ui/panel/desktop/video-editor/preference-setting-dialog.slint

@@ -20,6 +20,7 @@ import {
     SettingDetailInnerVbox,
     SettingDetailLabel,
     SettingDetailSwitch,
+    Slider,
 } from "../../../base/widgets.slint";
 
 component Track inherits SettingDetail {
@@ -55,6 +56,41 @@ component Track inherits SettingDetail {
                 }
             }
         }
+
+        SettingDetailInnerVbox {
+            as-hbox := HorizontalLayout {
+                alignment: start;
+                spacing: Theme.spacing * 4;
+
+                as-dl := SettingDetailLabel {
+                    text: Logic.tr("Audio waveform amplification");
+                    tip: Logic.tr("Adjust the amplitude scale for audio track waveform display");
+                }
+
+                VerticalLayout {
+                    alignment: center;
+
+                    amplification-slider := Slider {
+                        minimum: 1.0;
+                        maximum: 5.0;
+                        height: Theme.default-font-size / 2;
+                        finished-progress-color: Theme.thirdly-brand-color;
+                        indicator-size: self.has-hover ? self.height * 3 : 0;
+                        value: clamp(cache-config.audio-track-waveform-amplification, self.minimum, self.maximum);
+                        width: root.width - as-hbox.spacing * 2 - as-dl.preferred-width - as-lb.width - Theme.padding * 4;
+
+                        released(value) => {
+                            cache-config.audio-track-waveform-amplification = value;
+                        }
+                    }
+                }
+
+                as-lb := Label {
+                    text: round(amplification-slider.value * 10) / 10;
+                    width: Theme.default-font-size * 2;
+                }
+            }
+        }
     }
 }
 
@@ -119,8 +155,7 @@ component SettingPanle inherits SettingDetail {
     }
 
     VerticalLayout {
-        padding-top: Theme.padding;
-        padding-left: Theme.padding;
+        padding: Theme.padding;
         spacing: Theme.spacing;
 
         hbox := HorizontalLayout {