fix(Button): fix button visibility when grid column/row is zero

unoplatform · Oct 11, 2023 · 6218f02 · 6218f02
1 parent acfb64b
commit 6218f02
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/library/Uno.Material/Styles/Controls/v2/Button.xaml b/src/library/Uno.Material/Styles/Controls/v2/Button.xaml
@@ -180,16 +180,14 @@
 			<StaticResource x:Key="IconButtonEllipseFillPressed" ResourceKey="PrimaryPressedBrush" />
 			<StaticResource x:Key="IconButtonEllipseFillFocused" ResourceKey="PrimaryFocusedBrush" />
 
-			<x:Double x:Key="ButtonMinHeight">40</x:Double>
-			<x:Double x:Key="ButtonMinWidth">40</x:Double>
 			<x:Double x:Key="ButtonIconMinWidth">18</x:Double>
 			<x:Double x:Key="ElevatedButtonElevation">1</x:Double>
 			<x:Double x:Key="ElevatedButtonElevationDisabled">0</x:Double>
 			<x:Double x:Key="ButtonElevation">0</x:Double>
 			<x:Double x:Key="IconButtonOpacityVisibleState">1</x:Double>
 			<x:Double x:Key="IconButtonOpacityHiddenState">0</x:Double>
-			<Thickness x:Key="ButtonPadding">16,0</Thickness>
-			<Thickness x:Key="TextButtonPadding">12,0</Thickness>
+			<Thickness x:Key="ButtonPadding">16,10</Thickness>
+			<Thickness x:Key="TextButtonPadding">12,8</Thickness>
 			<Thickness x:Key="TextButtonIconMargin">0,0,8,0</Thickness>
 			<Thickness x:Key="ButtonBorderThickness">0</Thickness>
 			<Thickness x:Key="OutlinedButtonBorderThickness">1</Thickness>
@@ -357,16 +355,14 @@
 			<StaticResource x:Key="IconButtonEllipseFillPressed" ResourceKey="PrimaryPressedBrush" />
 			<StaticResource x:Key="IconButtonEllipseFillFocused" ResourceKey="PrimaryFocusedBrush" />
 
-			<x:Double x:Key="ButtonMinHeight">40</x:Double>
-			<x:Double x:Key="ButtonMinWidth">40</x:Double>
 			<x:Double x:Key="ButtonIconMinWidth">18</x:Double>
 			<x:Double x:Key="ElevatedButtonElevation">1</x:Double>
 			<x:Double x:Key="ElevatedButtonElevationDisabled">0</x:Double>
 			<x:Double x:Key="ButtonElevation">0</x:Double>
 			<x:Double x:Key="IconButtonOpacityVisibleState">1</x:Double>
 			<x:Double x:Key="IconButtonOpacityHiddenState">0</x:Double>
-			<Thickness x:Key="ButtonPadding">16,0</Thickness>
-			<Thickness x:Key="TextButtonPadding">12,0</Thickness>
+			<Thickness x:Key="ButtonPadding">16,10</Thickness>
+			<Thickness x:Key="TextButtonPadding">12,8</Thickness>
 			<Thickness x:Key="TextButtonIconMargin">0,0,8,0</Thickness>
 			<Thickness x:Key="ButtonBorderThickness">0</Thickness>
 			<Thickness x:Key="OutlinedButtonBorderThickness">1</Thickness>
@@ -389,8 +385,6 @@
 		<Setter Property="CharacterSpacing" Value="{ThemeResource LabelLargeCharacterSpacing}" />
 		<!-- End: Label Large Typo -->
 
-		<Setter Property="MinHeight" Value="{ThemeResource ButtonMinHeight}" />
-		<Setter Property="MinWidth" Value="{ThemeResource ButtonMinWidth}" />
 		<Setter Property="Padding" Value="{ThemeResource ButtonPadding}" />
 		<Setter Property="CornerRadius" Value="{ThemeResource ButtonCornerRadius}" />
 		<Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThickness}" />