Browse Source
Merge branch 'master' into fixes/Issue_3428
pull/4744/head
Max Katz
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
2 deletions
-
src/Avalonia.Themes.Default/ComboBox.xaml
-
src/Avalonia.Themes.Fluent/ComboBox.xaml
|
|
|
@ -26,6 +26,7 @@ |
|
|
|
<Setter Property="Padding" Value="4" /> |
|
|
|
<Setter Property="MinHeight" Value="20" /> |
|
|
|
<Setter Property="PlaceholderForeground" Value="{DynamicResource ThemeForegroundBrush}" /> |
|
|
|
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" /> |
|
|
|
<Setter Property="Template"> |
|
|
|
<ControlTemplate> |
|
|
|
<Border Name="border" |
|
|
|
@ -69,7 +70,8 @@ |
|
|
|
IsLightDismissEnabled="True"> |
|
|
|
<Border BorderBrush="{DynamicResource ThemeBorderMidBrush}" |
|
|
|
BorderThickness="1"> |
|
|
|
<ScrollViewer> |
|
|
|
<ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" |
|
|
|
VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"> |
|
|
|
<ItemsPresenter Name="PART_ItemsPresenter" |
|
|
|
Items="{TemplateBinding Items}" |
|
|
|
ItemsPanel="{TemplateBinding ItemsPanel}" |
|
|
|
|
|
|
|
@ -133,7 +133,8 @@ |
|
|
|
Padding="{DynamicResource ComboBoxDropdownBorderPadding}" |
|
|
|
HorizontalAlignment="Stretch" |
|
|
|
CornerRadius="{DynamicResource OverlayCornerRadius}"> |
|
|
|
<ScrollViewer> |
|
|
|
<ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" |
|
|
|
VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"> |
|
|
|
<ItemsPresenter Name="PART_ItemsPresenter" |
|
|
|
Items="{TemplateBinding Items}" |
|
|
|
Margin="{DynamicResource ComboBoxDropdownContentMargin}" |
|
|
|
|
