Skip to content

Commit 6218f02

Browse files
fix(Button): fix button visibility when grid column/row is zero
1 parent acfb64b commit 6218f02

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

src/library/Uno.Material/Styles/Controls/v2/Button.xaml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -180,16 +180,14 @@
180180
<StaticResource x:Key="IconButtonEllipseFillPressed" ResourceKey="PrimaryPressedBrush" />
181181
<StaticResource x:Key="IconButtonEllipseFillFocused" ResourceKey="PrimaryFocusedBrush" />
182182

183-
<x:Double x:Key="ButtonMinHeight">40</x:Double>
184-
<x:Double x:Key="ButtonMinWidth">40</x:Double>
185183
<x:Double x:Key="ButtonIconMinWidth">18</x:Double>
186184
<x:Double x:Key="ElevatedButtonElevation">1</x:Double>
187185
<x:Double x:Key="ElevatedButtonElevationDisabled">0</x:Double>
188186
<x:Double x:Key="ButtonElevation">0</x:Double>
189187
<x:Double x:Key="IconButtonOpacityVisibleState">1</x:Double>
190188
<x:Double x:Key="IconButtonOpacityHiddenState">0</x:Double>
191-
<Thickness x:Key="ButtonPadding">16,0</Thickness>
192-
<Thickness x:Key="TextButtonPadding">12,0</Thickness>
189+
<Thickness x:Key="ButtonPadding">16,10</Thickness>
190+
<Thickness x:Key="TextButtonPadding">12,8</Thickness>
193191
<Thickness x:Key="TextButtonIconMargin">0,0,8,0</Thickness>
194192
<Thickness x:Key="ButtonBorderThickness">0</Thickness>
195193
<Thickness x:Key="OutlinedButtonBorderThickness">1</Thickness>
@@ -357,16 +355,14 @@
357355
<StaticResource x:Key="IconButtonEllipseFillPressed" ResourceKey="PrimaryPressedBrush" />
358356
<StaticResource x:Key="IconButtonEllipseFillFocused" ResourceKey="PrimaryFocusedBrush" />
359357

360-
<x:Double x:Key="ButtonMinHeight">40</x:Double>
361-
<x:Double x:Key="ButtonMinWidth">40</x:Double>
362358
<x:Double x:Key="ButtonIconMinWidth">18</x:Double>
363359
<x:Double x:Key="ElevatedButtonElevation">1</x:Double>
364360
<x:Double x:Key="ElevatedButtonElevationDisabled">0</x:Double>
365361
<x:Double x:Key="ButtonElevation">0</x:Double>
366362
<x:Double x:Key="IconButtonOpacityVisibleState">1</x:Double>
367363
<x:Double x:Key="IconButtonOpacityHiddenState">0</x:Double>
368-
<Thickness x:Key="ButtonPadding">16,0</Thickness>
369-
<Thickness x:Key="TextButtonPadding">12,0</Thickness>
364+
<Thickness x:Key="ButtonPadding">16,10</Thickness>
365+
<Thickness x:Key="TextButtonPadding">12,8</Thickness>
370366
<Thickness x:Key="TextButtonIconMargin">0,0,8,0</Thickness>
371367
<Thickness x:Key="ButtonBorderThickness">0</Thickness>
372368
<Thickness x:Key="OutlinedButtonBorderThickness">1</Thickness>
@@ -389,8 +385,6 @@
389385
<Setter Property="CharacterSpacing" Value="{ThemeResource LabelLargeCharacterSpacing}" />
390386
<!-- End: Label Large Typo -->
391387

392-
<Setter Property="MinHeight" Value="{ThemeResource ButtonMinHeight}" />
393-
<Setter Property="MinWidth" Value="{ThemeResource ButtonMinWidth}" />
394388
<Setter Property="Padding" Value="{ThemeResource ButtonPadding}" />
395389
<Setter Property="CornerRadius" Value="{ThemeResource ButtonCornerRadius}" />
396390
<Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThickness}" />

0 commit comments

Comments
 (0)