fix(YaruTitleBar): add golden tests windows variant (#801)

ubuntu · Nov 19, 2023 · e6d02ca · e6d02ca
1 parent 22b8bb3
commit e6d02ca
Show file tree

Hide file tree

Showing 16 changed files with 86 additions and 67 deletions.
diff --git a/lib/src/widgets/yaru_title_bar.dart b/lib/src/widgets/yaru_title_bar.dart
@@ -619,6 +619,9 @@ class YaruDialogTitleBar extends YaruWindowTitleBar {
     super.onRestore = null,
     super.onShowMenu = YaruWindow.showMenu,
     super.heroTag = _kYaruTitleBarHeroTag,
+    super.platform,
+    super.buttonPadding,
+    super.buttonSpacing,
   });
 
   static const defaultShape = RoundedRectangleBorder(

diff --git a/test/widgets/goldens/yaru_title_bar-windows-closable-dark.png b/test/widgets/goldens/yaru_title_bar-windows-closable-dark.png
diff --git a/test/widgets/goldens/yaru_title_bar-windows-closable-light.png b/test/widgets/goldens/yaru_title_bar-windows-closable-light.png
diff --git a/test/widgets/goldens/yaru_title_bar-windows-dialog-dark.png b/test/widgets/goldens/yaru_title_bar-windows-dialog-dark.png
diff --git a/test/widgets/goldens/yaru_title_bar-windows-dialog-light.png b/test/widgets/goldens/yaru_title_bar-windows-dialog-light.png
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
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
diff --git a/test/widgets/goldens/yaru_title_bar-windows-empty-dark.png b/test/widgets/goldens/yaru_title_bar-windows-empty-dark.png
diff --git a/test/widgets/goldens/yaru_title_bar-windows-empty-light.png b/test/widgets/goldens/yaru_title_bar-windows-empty-light.png
diff --git a/test/widgets/goldens/yaru_title_bar-windows-inactive-dark.png b/test/widgets/goldens/yaru_title_bar-windows-inactive-dark.png
diff --git a/test/widgets/goldens/yaru_title_bar-windows-inactive-light.png b/test/widgets/goldens/yaru_title_bar-windows-inactive-light.png
diff --git a/test/widgets/goldens/yaru_title_bar-windows-maximizable-dark.png b/test/widgets/goldens/yaru_title_bar-windows-maximizable-dark.png
diff --git a/test/widgets/goldens/yaru_title_bar-windows-maximizable-light.png b/test/widgets/goldens/yaru_title_bar-windows-maximizable-light.png
diff --git a/test/widgets/goldens/yaru_title_bar-windows-restorable-dark.png b/test/widgets/goldens/yaru_title_bar-windows-restorable-dark.png
diff --git a/test/widgets/goldens/yaru_title_bar-windows-restorable-light.png b/test/widgets/goldens/yaru_title_bar-windows-restorable-light.png
diff --git a/test/widgets/yaru_title_bar_test.dart b/test/widgets/yaru_title_bar_test.dart
@@ -106,6 +106,14 @@ void main() {
     (tester) async {
       final variant = goldenVariant.currentValue!;
 
+      late YaruWindowControlPlatform platform;
+
+      if (variant.label.startsWith('windows')) {
+        platform = YaruWindowControlPlatform.windows;
+      } else {
+        platform = YaruWindowControlPlatform.yaru;
+      }
+
       final state = variant.value!;
       final builder = variant.label.contains('dialog')
           ? YaruDialogTitleBar.new
@@ -125,6 +133,7 @@ void main() {
           onMinimize: (_) {},
           onRestore: (_) {},
           backgroundColor: variant.label.contains('red') ? Colors.red : null,
+          platform: platform,
         ),
         themeMode: variant.themeMode,
         size: const Size(480, kYaruTitleBarHeight),
@@ -142,71 +151,78 @@ void main() {
 }
 
 final goldenVariant = ValueVariant({
-  ...goldenThemeVariants(
-    'empty',
-    const YaruWindowState(
-      isActive: true,
-      title: 'empty',
-    ),
-  ),
-  ...goldenThemeVariants(
-    'closable',
-    const YaruWindowState(
-      isActive: true,
-      isClosable: true,
-      title: 'closable',
-    ),
-  ),
-  ...goldenThemeVariants(
-    'maximizable',
-    const YaruWindowState(
-      isActive: true,
-      isMinimizable: true,
-      isMaximizable: true,
-      isClosable: true,
-      title: 'maximizable',
-    ),
-  ),
-  ...goldenThemeVariants(
-    'restorable',
-    const YaruWindowState(
-      isActive: true,
-      isMinimizable: true,
-      isRestorable: true,
-      isClosable: true,
-      title: 'restorable',
-    ),
-  ),
-  ...goldenThemeVariants(
-    'inactive',
-    const YaruWindowState(
-      isActive: false,
-      isMinimizable: true,
-      isMaximizable: true,
-      isClosable: true,
-      title: 'inactive',
-    ),
-  ),
-  ...goldenThemeVariants(
-    'dialog',
-    const YaruWindowState(
-      isActive: true,
-      isMinimizable: false,
-      isMaximizable: false,
-      isRestorable: false,
-      isClosable: true,
-      title: 'dialog',
-    ),
-  ),
-  ...goldenThemeVariants(
-    'dialog-red',
-    const YaruWindowState(
-      isActive: true,
-      isClosable: true,
-      isMinimizable: false,
-      isMaximizable: false,
-      isRestorable: false,
-      title: 'red dialog',
-    ),
-  ),
+  for (final platform in YaruWindowControlPlatform.values)
+    ...() {
+      final platformPrefix =
+          platform == YaruWindowControlPlatform.windows ? 'windows-' : '';
+      return {
+        ...goldenThemeVariants(
+          '${platformPrefix}empty',
+          const YaruWindowState(
+            isActive: true,
+            title: 'empty',
+          ),
+        ),
+        ...goldenThemeVariants(
+          '${platformPrefix}closable',
+          const YaruWindowState(
+            isActive: true,
+            isClosable: true,
+            title: 'closable',
+          ),
+        ),
+        ...goldenThemeVariants(
+          '${platformPrefix}maximizable',
+          const YaruWindowState(
+            isActive: true,
+            isMinimizable: true,
+            isMaximizable: true,
+            isClosable: true,
+            title: 'maximizable',
+          ),
+        ),
+        ...goldenThemeVariants(
+          '${platformPrefix}restorable',
+          const YaruWindowState(
+            isActive: true,
+            isMinimizable: true,
+            isRestorable: true,
+            isClosable: true,
+            title: 'restorable',
+          ),
+        ),
+        ...goldenThemeVariants(
+          '${platformPrefix}inactive',
+          const YaruWindowState(
+            isActive: false,
+            isMinimizable: true,
+            isMaximizable: true,
+            isClosable: true,
+            title: 'inactive',
+          ),
+        ),
+        ...goldenThemeVariants(
+          '${platformPrefix}dialog',
+          const YaruWindowState(
+            isActive: true,
+            isMinimizable: false,
+            isMaximizable: false,
+            isRestorable: false,
+            isClosable: true,
+            title: 'dialog',
+          ),
+        ),
+        ...goldenThemeVariants(
+          '${platformPrefix}dialog-red',
+          const YaruWindowState(
+            isActive: true,
+            isClosable: true,
+            isMinimizable: false,
+            isMaximizable: false,
+            isRestorable: false,
+            title: 'red dialog',
+          ),
+        ),
+      };
+    }(),
 });