YaruPopupMenuButton: sync border with OutlinedButton (#539)

* YaruPopupMenuButton: sync border with OutlinedButton Ref: #244 * Update goldens
ubuntu · Jan 18, 2023 · 1776e0f · 1776e0f
1 parent 7565d9a
commit 1776e0f
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 3 deletions.
diff --git a/lib/src/controls/yaru_popup_menu_button.dart b/lib/src/controls/yaru_popup_menu_button.dart
@@ -83,16 +83,19 @@ class _YaruPopupDecoration extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final side = OutlinedButtonTheme.of(context).style?.side?.resolve({});
     return DefaultTextStyle(
       style: TextStyle(
         color: Theme.of(context).colorScheme.onSurface,
         fontWeight: FontWeight.w500,
       ),
       child: Container(
         padding: childPadding,
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(kYaruButtonRadius),
-          border: Border.all(color: Theme.of(context).dividerColor),
+        decoration: ShapeDecoration(
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(kYaruButtonRadius),
+            side: side ?? BorderSide(color: Theme.of(context).dividerColor),
+          ),
         ),
         child: Row(
           mainAxisSize: MainAxisSize.min,

diff --git a/test/controls/goldens/yaru_popup_menu_item-checked-dark.png b/test/controls/goldens/yaru_popup_menu_item-checked-dark.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-checked-disabled-dark.png b/test/controls/goldens/yaru_popup_menu_item-checked-disabled-dark.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-checked-disabled-light.png b/test/controls/goldens/yaru_popup_menu_item-checked-disabled-light.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-checked-hovered-dark.png b/test/controls/goldens/yaru_popup_menu_item-checked-hovered-dark.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-checked-hovered-light.png b/test/controls/goldens/yaru_popup_menu_item-checked-hovered-light.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-checked-light.png b/test/controls/goldens/yaru_popup_menu_item-checked-light.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-checked-pressed-dark.png b/test/controls/goldens/yaru_popup_menu_item-checked-pressed-dark.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-checked-pressed-light.png b/test/controls/goldens/yaru_popup_menu_item-checked-pressed-light.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-unchecked-dark.png b/test/controls/goldens/yaru_popup_menu_item-unchecked-dark.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-unchecked-disabled-dark.png b/test/controls/goldens/yaru_popup_menu_item-unchecked-disabled-dark.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-unchecked-disabled-light.png b/test/controls/goldens/yaru_popup_menu_item-unchecked-disabled-light.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-unchecked-hovered-dark.png b/test/controls/goldens/yaru_popup_menu_item-unchecked-hovered-dark.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-unchecked-hovered-light.png b/test/controls/goldens/yaru_popup_menu_item-unchecked-hovered-light.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-unchecked-light.png b/test/controls/goldens/yaru_popup_menu_item-unchecked-light.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-unchecked-pressed-dark.png b/test/controls/goldens/yaru_popup_menu_item-unchecked-pressed-dark.png
diff --git a/test/controls/goldens/yaru_popup_menu_item-unchecked-pressed-light.png b/test/controls/goldens/yaru_popup_menu_item-unchecked-pressed-light.png