fix: reduce switch active scale (#780)

Fix scale computing so it looks like before #777
ubuntu · Sep 20, 2023 · 1b70816 · 1b70816
1 parent 2994c72
commit 1b70816
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 2 deletions.
diff --git a/lib/src/widgets/yaru_togglable.dart b/lib/src/widgets/yaru_togglable.dart
@@ -10,7 +10,7 @@ const _kTogglableSizeAnimationDuration = Duration(milliseconds: 100);
 const _kIndicatorAnimationDuration = Duration(milliseconds: 200);
 const _kIndicatorRadius = 20.0;
 // Used to resize the canvas on active state. Must be an even number.
-const _kTogglableActiveResizeFactor = .1;
+const _kTogglableActiveResizeFactor = 2;
 
 /// A generic class to create a togglable widget
 ///
@@ -427,7 +427,14 @@ abstract class YaruTogglablePainter extends ChangeNotifier
   @override
   void paint(Canvas canvas, Size size) {
     final origin = (Offset.zero & size).center;
-    final scale = 1 - _kTogglableActiveResizeFactor * sizePosition.value;
+
+    final activeScaleX =
+        1 - (size.width - _kTogglableActiveResizeFactor) / size.width;
+    final activeScaleY =
+        1 - (size.height - _kTogglableActiveResizeFactor) / size.height;
+    final activeScale =
+        activeScaleX > activeScaleY ? activeScaleX : activeScaleY;
+    final scale = 1 - activeScale * sizePosition.value;
 
     canvas.save();
     canvas.translate(origin.dx, origin.dy);

diff --git a/test/widgets/goldens/yaru_switch-checked-pressed-dark.png b/test/widgets/goldens/yaru_switch-checked-pressed-dark.png
diff --git a/test/widgets/goldens/yaru_switch-checked-pressed-light.png b/test/widgets/goldens/yaru_switch-checked-pressed-light.png
diff --git a/test/widgets/goldens/yaru_switch-unckecked-pressed-dark.png b/test/widgets/goldens/yaru_switch-unckecked-pressed-dark.png
diff --git a/test/widgets/goldens/yaru_switch-unckecked-pressed-light.png b/test/widgets/goldens/yaru_switch-unckecked-pressed-light.png
diff --git a/test/widgets/goldens/yaru_switch_button-off-pressed-dark.png b/test/widgets/goldens/yaru_switch_button-off-pressed-dark.png
diff --git a/test/widgets/goldens/yaru_switch_button-off-pressed-light.png b/test/widgets/goldens/yaru_switch_button-off-pressed-light.png
diff --git a/test/widgets/goldens/yaru_switch_button-on-pressed-dark.png b/test/widgets/goldens/yaru_switch_button-on-pressed-dark.png
diff --git a/test/widgets/goldens/yaru_switch_button-on-pressed-light.png b/test/widgets/goldens/yaru_switch_button-on-pressed-light.png
diff --git a/test/widgets/goldens/yaru_switch_list_tile-off-pressed-dark.png b/test/widgets/goldens/yaru_switch_list_tile-off-pressed-dark.png
diff --git a/test/widgets/goldens/yaru_switch_list_tile-off-pressed-light.png b/test/widgets/goldens/yaru_switch_list_tile-off-pressed-light.png
diff --git a/test/widgets/goldens/yaru_switch_list_tile-on-pressed-dark.png b/test/widgets/goldens/yaru_switch_list_tile-on-pressed-dark.png
diff --git a/test/widgets/goldens/yaru_switch_list_tile-on-pressed-light.png b/test/widgets/goldens/yaru_switch_list_tile-on-pressed-light.png