Browse Source

Better set MinHeight in controls with drop-down chevrons

pull/7838/head
robloo 4 years ago
parent
commit
a1e9558c41
  1. 2
      src/Avalonia.Themes.Default/Controls/SplitButton.xaml
  2. 2
      src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
  3. 2
      src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
  4. 2
      src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml

2
src/Avalonia.Themes.Default/Controls/SplitButton.xaml

@ -16,6 +16,7 @@
<x:Double x:Key="SplitButtonPrimaryButtonSize">24</x:Double>
<x:Double x:Key="SplitButtonSecondaryButtonSize">24</x:Double>
<x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
<x:Double x:Key="SplitButtonMinHeight">24</x:Double>
<Thickness x:Key="SplitButtonBorderThemeThickness">1</Thickness>
<converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True" Indent="1" />
@ -59,6 +60,7 @@
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForeground}" />
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrush}" />
<Setter Property="BorderThickness" Value="{DynamicResource SplitButtonBorderThemeThickness}" />
<Setter Property="MinHeight" Value="{DynamicResource SplitButtonMinHeight}" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />

2
src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml

@ -37,6 +37,7 @@
<Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxMinHeight}" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Left" />
@ -106,7 +107,6 @@
Grid.Column="1"
UseLayoutRounding="False"
IsHitTestVisible="False"
MinHeight="{DynamicResource ComboBoxMinHeight}"
Height="12"
Width="12"
Margin="0,0,10,0"

2
src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml

@ -21,6 +21,7 @@
<Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrush}" />
<Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
<Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
<Setter Property="MinHeight" Value="{DynamicResource DropDownButtonMinHeight}" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
@ -56,7 +57,6 @@
Grid.Column="1"
UseLayoutRounding="False"
IsHitTestVisible="False"
MinHeight="{DynamicResource DropDownButtonMinHeight}"
Height="12"
Width="12"
Margin="0,0,10,0"

2
src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml

@ -24,6 +24,7 @@
<x:Double x:Key="SplitButtonPrimaryButtonSize">32</x:Double>
<x:Double x:Key="SplitButtonSecondaryButtonSize">32</x:Double>
<x:Double x:Key="SplitButtonSeparatorWidth">1</x:Double>
<x:Double x:Key="SplitButtonMinHeight">32</x:Double>
<converters:MarginMultiplierConverter x:Key="PrimaryButtonBorderMultiplier" Left="True" Top="True" Bottom="True" Indent="1" />
<converters:MarginMultiplierConverter x:Key="SecondaryButtonBorderMultiplier" Right="True" Top="True" Bottom="True" Indent="1" />
@ -35,6 +36,7 @@
<Setter Property="Foreground" Value="{DynamicResource SplitButtonForeground}" />
<Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrush}" />
<Setter Property="BorderThickness" Value="{DynamicResource SplitButtonBorderThemeThickness}" />
<Setter Property="MinHeight" Value="{DynamicResource SplitButtonMinHeight}" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />

Loading…
Cancel
Save