[*] fix: cursor tracking transition

Author: heng30

lib/recorder/src/cursor_tracker.rs

@@ -358,18 +358,24 @@ impl CursorTracker {
             (EdgeState::Left, EdgeTouch::Right) => true,
             (EdgeState::Left, EdgeTouch::Top) => true,
             (EdgeState::Left, EdgeTouch::Bottom) => true,
+            (EdgeState::Left, EdgeTouch::TopLeft) => true,
             (EdgeState::Left, EdgeTouch::TopRight) => true,
+            (EdgeState::Left, EdgeTouch::BottomLeft) => true,
             (EdgeState::Left, EdgeTouch::BottomRight) => true,
 
             (EdgeState::Right, EdgeTouch::Left) => true,
             (EdgeState::Right, EdgeTouch::Top) => true,
             (EdgeState::Right, EdgeTouch::Bottom) => true,
             (EdgeState::Right, EdgeTouch::TopLeft) => true,
+            (EdgeState::Right, EdgeTouch::TopRight) => true,
             (EdgeState::Right, EdgeTouch::BottomLeft) => true,
+            (EdgeState::Right, EdgeTouch::BottomRight) => true,
 
             (EdgeState::Top, EdgeTouch::Left) => true,
             (EdgeState::Top, EdgeTouch::Right) => true,
             (EdgeState::Top, EdgeTouch::Bottom) => true,
+            (EdgeState::Top, EdgeTouch::TopLeft) => true,
+            (EdgeState::Top, EdgeTouch::TopRight) => true,
             (EdgeState::Top, EdgeTouch::BottomLeft) => true,
             (EdgeState::Top, EdgeTouch::BottomRight) => true,
 
@@ -378,6 +384,8 @@ impl CursorTracker {
             (EdgeState::Bottom, EdgeTouch::Top) => true,
             (EdgeState::Bottom, EdgeTouch::TopLeft) => true,
             (EdgeState::Bottom, EdgeTouch::TopRight) => true,
+            (EdgeState::Bottom, EdgeTouch::BottomLeft) => true,
+            (EdgeState::Bottom, EdgeTouch::BottomRight) => true,
 
             _ => false,
         }

tr-helper/src/tr.rs

@@ -263,7 +263,8 @@ fn cn() -> &'static HashMap<&'static str, &'static str> {
             ("After zooming in, the transition time of the cursor when moving across the area.","放大后，移动区域时光标的过度时间" ),
             ("Reposition transition duration(milliseconds)", "重新定位时间间隔（毫秒）"),
             ("After zooming in, when touching the boundary of the area, move the area.", "放大后，触碰到区域边界，移动区域"),
-
+            ("Zoom transition effect", "缩放效果"),
+            ("Reposition edge threshold(0-0.5)", "重新定位边界阈值（0-0.5）"),
         ])
     })
 }

wayshot/src/config.rs

@@ -175,10 +175,10 @@ pub struct CursorTracker {
     #[derivative(Default(value = "30"))]
     pub stable_radius: i32,
 
-    #[derivative(Default(value = "300"))]
+    #[derivative(Default(value = "200"))]
     pub fast_moving_duration: i32,
 
-    #[derivative(Default(value = "800"))]
+    #[derivative(Default(value = "1000"))]
     pub zoom_transition_duration: i32,
 
     #[derivative(Default(value = "0.15"))]

wayshot/src/logic/tr.rs

@@ -265,7 +265,8 @@ fn cn() -> &'static HashMap<&'static str, &'static str> {
             ("After zooming in, the transition time of the cursor when moving across the area.","放大后，移动区域时光标的过度时间" ),
             ("Reposition transition duration(milliseconds)", "重新定位时间间隔（毫秒）"),
             ("After zooming in, when touching the boundary of the area, move the area.", "放大后，触碰到区域边界，移动区域"),
-
+            ("Zoom transition effect", "缩放效果"),
+            ("Reposition edge threshold(0-0.5)", "重新定位边界阈值（0-0.5）"),
         ])
     })
 }

wayshot/ui/panel/setting/components/cursor-tracker.slint

@@ -148,7 +148,7 @@ export component CursorTracker inherits SettingDetail {
                 }
 
                 zoom-transition-effect-select := Select {
-                    values: ["Linear", "Ease-InOut"];
+                    values: ["Linear", "Ease InOut"];
                     current-value: root.setting.zoom_in_transition_type == TransitionType.Linear || root.setting.zoom-out-transition-type == TransitionType.Linear ? self.values[0] : self.values[1];
                 }
             }