diff --git a/lib/src/widgets/yaru_window_control.dart b/lib/src/widgets/yaru_window_control.dart index 68face0e6..a731f5ac8 100644 --- a/lib/src/widgets/yaru_window_control.dart +++ b/lib/src/widgets/yaru_window_control.dart @@ -8,7 +8,7 @@ import 'package:yaru/theme.dart'; const kYaruWindowControlSize = 24.0; /// The size of a [YaruWindowControl] on the [YaruWindowControlPlatform.windows] platform. -const kYaruWindowsWindowControlSize = Size(44, 28); +const kYaruWindowsWindowControlSize = 46.0; const _kWindowControlIconStrokeWidth = 1.0; const _kWindowControlIconStrokeAlign = _kWindowControlIconStrokeWidth / 2; @@ -322,8 +322,8 @@ class _YaruWindowControlState extends State ) : null, ), - child: SizedBox.fromSize( - size: kYaruWindowsWindowControlSize, + child: SizedBox.square( + dimension: kYaruWindowsWindowControlSize, child: child, ), ); diff --git a/test/widgets/goldens/yaru_title_bar-windows-closable-dark.png b/test/widgets/goldens/yaru_title_bar-windows-closable-dark.png index 078057b49..65f6d4c46 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-closable-dark.png and b/test/widgets/goldens/yaru_title_bar-windows-closable-dark.png differ diff --git a/test/widgets/goldens/yaru_title_bar-windows-closable-light.png b/test/widgets/goldens/yaru_title_bar-windows-closable-light.png index 917352333..321c83ead 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-closable-light.png and b/test/widgets/goldens/yaru_title_bar-windows-closable-light.png differ diff --git a/test/widgets/goldens/yaru_title_bar-windows-dialog-dark.png b/test/widgets/goldens/yaru_title_bar-windows-dialog-dark.png index 3038bbd2f..f7d6fc589 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-dialog-dark.png and b/test/widgets/goldens/yaru_title_bar-windows-dialog-dark.png differ diff --git a/test/widgets/goldens/yaru_title_bar-windows-dialog-light.png b/test/widgets/goldens/yaru_title_bar-windows-dialog-light.png index c2b908dc3..7c1281a37 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-dialog-light.png and b/test/widgets/goldens/yaru_title_bar-windows-dialog-light.png differ diff --git a/test/widgets/goldens/yaru_title_bar-windows-dialog-red-dark.png b/test/widgets/goldens/yaru_title_bar-windows-dialog-red-dark.png index b37708eb0..3958dc6c7 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-dialog-red-dark.png and b/test/widgets/goldens/yaru_title_bar-windows-dialog-red-dark.png differ diff --git a/test/widgets/goldens/yaru_title_bar-windows-dialog-red-light.png b/test/widgets/goldens/yaru_title_bar-windows-dialog-red-light.png index 1ec69e85b..abf89d9f0 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-dialog-red-light.png and b/test/widgets/goldens/yaru_title_bar-windows-dialog-red-light.png differ diff --git a/test/widgets/goldens/yaru_title_bar-windows-empty-dark.png b/test/widgets/goldens/yaru_title_bar-windows-empty-dark.png index 0481a6944..a43671a91 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-empty-dark.png and b/test/widgets/goldens/yaru_title_bar-windows-empty-dark.png differ diff --git a/test/widgets/goldens/yaru_title_bar-windows-empty-light.png b/test/widgets/goldens/yaru_title_bar-windows-empty-light.png index 58f3ab245..5337860f6 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-empty-light.png and b/test/widgets/goldens/yaru_title_bar-windows-empty-light.png differ diff --git a/test/widgets/goldens/yaru_title_bar-windows-inactive-dark.png b/test/widgets/goldens/yaru_title_bar-windows-inactive-dark.png index f47033e6b..af249dc76 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-inactive-dark.png and b/test/widgets/goldens/yaru_title_bar-windows-inactive-dark.png differ diff --git a/test/widgets/goldens/yaru_title_bar-windows-inactive-light.png b/test/widgets/goldens/yaru_title_bar-windows-inactive-light.png index a92677151..6d207a09c 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-inactive-light.png and b/test/widgets/goldens/yaru_title_bar-windows-inactive-light.png differ diff --git a/test/widgets/goldens/yaru_title_bar-windows-maximizable-dark.png b/test/widgets/goldens/yaru_title_bar-windows-maximizable-dark.png index 6ebf8f5f7..4d1677d7d 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-maximizable-dark.png and b/test/widgets/goldens/yaru_title_bar-windows-maximizable-dark.png differ diff --git a/test/widgets/goldens/yaru_title_bar-windows-maximizable-light.png b/test/widgets/goldens/yaru_title_bar-windows-maximizable-light.png index d5ec79980..0b70bed19 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-maximizable-light.png and b/test/widgets/goldens/yaru_title_bar-windows-maximizable-light.png differ diff --git a/test/widgets/goldens/yaru_title_bar-windows-restorable-dark.png b/test/widgets/goldens/yaru_title_bar-windows-restorable-dark.png index b473ffa47..318abd1e0 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-restorable-dark.png and b/test/widgets/goldens/yaru_title_bar-windows-restorable-dark.png differ diff --git a/test/widgets/goldens/yaru_title_bar-windows-restorable-light.png b/test/widgets/goldens/yaru_title_bar-windows-restorable-light.png index b32a3647e..9921bf22e 100644 Binary files a/test/widgets/goldens/yaru_title_bar-windows-restorable-light.png and b/test/widgets/goldens/yaru_title_bar-windows-restorable-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-close-dark.png b/test/widgets/goldens/yaru_window_control-windows-close-dark.png index 43d719409..b94e4134e 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-close-dark.png and b/test/widgets/goldens/yaru_window_control-windows-close-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-close-disabled-dark.png b/test/widgets/goldens/yaru_window_control-windows-close-disabled-dark.png index 7fd0d5e3b..0e240793e 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-close-disabled-dark.png and b/test/widgets/goldens/yaru_window_control-windows-close-disabled-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-close-disabled-light.png b/test/widgets/goldens/yaru_window_control-windows-close-disabled-light.png index e22f44f7d..ccc14354d 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-close-disabled-light.png and b/test/widgets/goldens/yaru_window_control-windows-close-disabled-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-close-hovered-dark.png b/test/widgets/goldens/yaru_window_control-windows-close-hovered-dark.png index 4b80408a8..d22eb6fd6 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-close-hovered-dark.png and b/test/widgets/goldens/yaru_window_control-windows-close-hovered-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-close-hovered-light.png b/test/widgets/goldens/yaru_window_control-windows-close-hovered-light.png index 4b80408a8..d22eb6fd6 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-close-hovered-light.png and b/test/widgets/goldens/yaru_window_control-windows-close-hovered-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-close-light.png b/test/widgets/goldens/yaru_window_control-windows-close-light.png index 1dcf48dff..eb81db9cd 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-close-light.png and b/test/widgets/goldens/yaru_window_control-windows-close-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-close-pressed-dark.png b/test/widgets/goldens/yaru_window_control-windows-close-pressed-dark.png index e827ac79a..bc7cd5fdb 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-close-pressed-dark.png and b/test/widgets/goldens/yaru_window_control-windows-close-pressed-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-close-pressed-light.png b/test/widgets/goldens/yaru_window_control-windows-close-pressed-light.png index 1567d1369..5db6a9c21 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-close-pressed-light.png and b/test/widgets/goldens/yaru_window_control-windows-close-pressed-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-maximize-dark.png b/test/widgets/goldens/yaru_window_control-windows-maximize-dark.png index 64eb778b8..b63c7c842 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-maximize-dark.png and b/test/widgets/goldens/yaru_window_control-windows-maximize-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-maximize-disabled-dark.png b/test/widgets/goldens/yaru_window_control-windows-maximize-disabled-dark.png index 89415d3d3..5ba5afdbc 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-maximize-disabled-dark.png and b/test/widgets/goldens/yaru_window_control-windows-maximize-disabled-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-maximize-disabled-light.png b/test/widgets/goldens/yaru_window_control-windows-maximize-disabled-light.png index 7184555e7..56504dee0 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-maximize-disabled-light.png and b/test/widgets/goldens/yaru_window_control-windows-maximize-disabled-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-maximize-hovered-dark.png b/test/widgets/goldens/yaru_window_control-windows-maximize-hovered-dark.png index 61a44762c..db0eb2bab 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-maximize-hovered-dark.png and b/test/widgets/goldens/yaru_window_control-windows-maximize-hovered-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-maximize-hovered-light.png b/test/widgets/goldens/yaru_window_control-windows-maximize-hovered-light.png index 5ca32dc17..10a78b266 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-maximize-hovered-light.png and b/test/widgets/goldens/yaru_window_control-windows-maximize-hovered-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-maximize-light.png b/test/widgets/goldens/yaru_window_control-windows-maximize-light.png index 850cc6fe1..559a3a2a7 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-maximize-light.png and b/test/widgets/goldens/yaru_window_control-windows-maximize-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-maximize-pressed-dark.png b/test/widgets/goldens/yaru_window_control-windows-maximize-pressed-dark.png index 19620caaf..32cc52d67 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-maximize-pressed-dark.png and b/test/widgets/goldens/yaru_window_control-windows-maximize-pressed-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-maximize-pressed-light.png b/test/widgets/goldens/yaru_window_control-windows-maximize-pressed-light.png index 3ef9ce99c..57509aa29 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-maximize-pressed-light.png and b/test/widgets/goldens/yaru_window_control-windows-maximize-pressed-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-minimize-dark.png b/test/widgets/goldens/yaru_window_control-windows-minimize-dark.png index 80f012428..45edd106b 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-minimize-dark.png and b/test/widgets/goldens/yaru_window_control-windows-minimize-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-minimize-disabled-dark.png b/test/widgets/goldens/yaru_window_control-windows-minimize-disabled-dark.png index ab71664ce..a8a3e03c6 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-minimize-disabled-dark.png and b/test/widgets/goldens/yaru_window_control-windows-minimize-disabled-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-minimize-disabled-light.png b/test/widgets/goldens/yaru_window_control-windows-minimize-disabled-light.png index b481b0a3b..b3b0e5dbe 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-minimize-disabled-light.png and b/test/widgets/goldens/yaru_window_control-windows-minimize-disabled-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-minimize-hovered-dark.png b/test/widgets/goldens/yaru_window_control-windows-minimize-hovered-dark.png index bc1c2b3cb..3fd130388 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-minimize-hovered-dark.png and b/test/widgets/goldens/yaru_window_control-windows-minimize-hovered-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-minimize-hovered-light.png b/test/widgets/goldens/yaru_window_control-windows-minimize-hovered-light.png index 0fa3f6eb5..fc3f3388f 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-minimize-hovered-light.png and b/test/widgets/goldens/yaru_window_control-windows-minimize-hovered-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-minimize-light.png b/test/widgets/goldens/yaru_window_control-windows-minimize-light.png index 7490d3047..325bae5b3 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-minimize-light.png and b/test/widgets/goldens/yaru_window_control-windows-minimize-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-minimize-pressed-dark.png b/test/widgets/goldens/yaru_window_control-windows-minimize-pressed-dark.png index 3f01b8cb7..522751889 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-minimize-pressed-dark.png and b/test/widgets/goldens/yaru_window_control-windows-minimize-pressed-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-minimize-pressed-light.png b/test/widgets/goldens/yaru_window_control-windows-minimize-pressed-light.png index f82dbd9e7..a8bc748a3 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-minimize-pressed-light.png and b/test/widgets/goldens/yaru_window_control-windows-minimize-pressed-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-restore-dark.png b/test/widgets/goldens/yaru_window_control-windows-restore-dark.png index a50cb1132..048e1b508 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-restore-dark.png and b/test/widgets/goldens/yaru_window_control-windows-restore-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-restore-disabled-dark.png b/test/widgets/goldens/yaru_window_control-windows-restore-disabled-dark.png index 7b6d43be6..8bf0fa377 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-restore-disabled-dark.png and b/test/widgets/goldens/yaru_window_control-windows-restore-disabled-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-restore-disabled-light.png b/test/widgets/goldens/yaru_window_control-windows-restore-disabled-light.png index 7efd9287e..4e554655e 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-restore-disabled-light.png and b/test/widgets/goldens/yaru_window_control-windows-restore-disabled-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-restore-hovered-dark.png b/test/widgets/goldens/yaru_window_control-windows-restore-hovered-dark.png index 2c8b80082..f014cf73d 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-restore-hovered-dark.png and b/test/widgets/goldens/yaru_window_control-windows-restore-hovered-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-restore-hovered-light.png b/test/widgets/goldens/yaru_window_control-windows-restore-hovered-light.png index 7272857ad..8d5ede507 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-restore-hovered-light.png and b/test/widgets/goldens/yaru_window_control-windows-restore-hovered-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-restore-light.png b/test/widgets/goldens/yaru_window_control-windows-restore-light.png index 3f98829b1..25d3b4fd8 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-restore-light.png and b/test/widgets/goldens/yaru_window_control-windows-restore-light.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-restore-pressed-dark.png b/test/widgets/goldens/yaru_window_control-windows-restore-pressed-dark.png index 4aaca13e4..ec069c665 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-restore-pressed-dark.png and b/test/widgets/goldens/yaru_window_control-windows-restore-pressed-dark.png differ diff --git a/test/widgets/goldens/yaru_window_control-windows-restore-pressed-light.png b/test/widgets/goldens/yaru_window_control-windows-restore-pressed-light.png index fe695e7bf..dad3c4146 100644 Binary files a/test/widgets/goldens/yaru_window_control-windows-restore-pressed-light.png and b/test/widgets/goldens/yaru_window_control-windows-restore-pressed-light.png differ diff --git a/test/widgets/yaru_window_control_test.dart b/test/widgets/yaru_window_control_test.dart index 5924e1e0d..120c0f0d1 100644 --- a/test/widgets/yaru_window_control_test.dart +++ b/test/widgets/yaru_window_control_test.dart @@ -50,7 +50,7 @@ void main() { if (variant.label.startsWith('windows')) { platform = YaruWindowControlPlatform.windows; - size = kYaruWindowsWindowControlSize; + size = const Size.square(kYaruWindowsWindowControlSize); } else { platform = YaruWindowControlPlatform.yaru; size = const Size.square(kYaruWindowControlSize);