Browse Source

Merge branch 'master' into feature/fluent-combobox

pull/4019/head
danwalmsley 6 years ago
committed by GitHub
parent
commit
e589565685
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
  2. 1
      src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
  3. 1
      src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml

1
src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml

@ -161,6 +161,7 @@
<x:Double x:Key="AppBarThemeMinimalHeight">24</x:Double>
<x:Double x:Key="AppBarThemeCompactHeight">40</x:Double>
<x:Double x:Key="AppBarExpandButtonCircleDiameter">3</x:Double>
<x:Double x:Key="AutoCompleteListMaxHeight">374</x:Double>
<x:Double x:Key="AutoCompleteListBorderOpacity">0</x:Double>
<Thickness x:Key="CheckBoxBorderThemeThickness">2</Thickness>
<Thickness x:Key="CheckBoxCheckedStrokeThickness">0</Thickness>

1
src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml

@ -160,6 +160,7 @@
<x:Double x:Key="AppBarThemeMinimalHeight">24</x:Double>
<x:Double x:Key="AppBarThemeCompactHeight">40</x:Double>
<x:Double x:Key="AppBarExpandButtonCircleDiameter">3</x:Double>
<x:Double x:Key="AutoCompleteListMaxHeight">374</x:Double>
<x:Double x:Key="AutoCompleteListBorderOpacity">0</x:Double>
<Thickness x:Key="CheckBoxBorderThemeThickness">2</Thickness>
<Thickness x:Key="CheckBoxCheckedStrokeThickness">0</Thickness>

1
src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml

@ -26,6 +26,7 @@
<Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
<Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
<Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteListMaxHeight}" />
<Setter Property="Template">
<ControlTemplate>
<Grid Name="PART_LayoutRoot">

Loading…
Cancel
Save