Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions src/library/Uno.Material/Styles/Controls/v2/Button.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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}" />
Expand Down
Loading