From 10ad9eb7ede6218f24b05c5f9b490c520453d0c2 Mon Sep 17 00:00:00 2001
From: Symbai <14368203+Symbai@users.noreply.github.com>
Date: Sat, 8 Feb 2020 14:34:32 +0100
Subject: [PATCH 1/2] Update ComboBox.xaml

---
 src/Avalonia.Themes.Default/ComboBox.xaml | 29 +++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Themes.Default/ComboBox.xaml b/src/Avalonia.Themes.Default/ComboBox.xaml
index 1c5c8106d3..ff9985e81e 100644
--- a/src/Avalonia.Themes.Default/ComboBox.xaml
+++ b/src/Avalonia.Themes.Default/ComboBox.xaml
@@ -40,14 +40,14 @@
                    StaysOpen="False">
               <Border BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                       BorderThickness="1">
-                  <ScrollViewer>
-                      <ItemsPresenter Name="PART_ItemsPresenter"
-                                      Items="{TemplateBinding Items}"
-                                      ItemsPanel="{TemplateBinding ItemsPanel}"
-                                      ItemTemplate="{TemplateBinding ItemTemplate}"
-                                      VirtualizationMode="{TemplateBinding VirtualizationMode}"
+                <ScrollViewer>
+                  <ItemsPresenter Name="PART_ItemsPresenter"
+                                  Items="{TemplateBinding Items}"
+                                  ItemsPanel="{TemplateBinding ItemsPanel}"
+                                  ItemTemplate="{TemplateBinding ItemTemplate}"
+                                  VirtualizationMode="{TemplateBinding VirtualizationMode}"
                               />
-                  </ScrollViewer>
+                </ScrollViewer>
               </Border>
             </Popup>
           </Grid>
@@ -58,7 +58,16 @@
   <Style Selector="ComboBox:pointerover /template/ Border#border">
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
   </Style>
-    <Style Selector="ComboBox:disabled /template/ Border#border">
-        <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
-    </Style>
+  <Style Selector="ComboBox:disabled /template/ Border#border">
+    <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
+  </Style>
+  <Style Selector="ComboBox[SelectedIndex=-1] /template/ ContentControl">
+    <Setter Property="Content">
+      <Setter.Value>
+        <Template>
+          <TextBlock Text=" " />
+        </Template>
+      </Setter.Value>
+    </Setter>
+  </Style>
 </Styles>

From 10d1412d0c625125efd01d1d26ee8f64bf4a2fbc Mon Sep 17 00:00:00 2001
From: Symbai <14368203+Symbai@users.noreply.github.com>
Date: Tue, 11 Feb 2020 14:20:46 +0100
Subject: [PATCH 2/2] Update ComboBox.xaml

---
 src/Avalonia.Themes.Default/ComboBox.xaml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Avalonia.Themes.Default/ComboBox.xaml b/src/Avalonia.Themes.Default/ComboBox.xaml
index ff9985e81e..2afed09b0c 100644
--- a/src/Avalonia.Themes.Default/ComboBox.xaml
+++ b/src/Avalonia.Themes.Default/ComboBox.xaml
@@ -4,6 +4,7 @@
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
     <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
     <Setter Property="Padding" Value="4"/>
+    <Setter Property="MinHeight" Value="20"/>
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="border"
@@ -61,13 +62,4 @@
   <Style Selector="ComboBox:disabled /template/ Border#border">
     <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
   </Style>
-  <Style Selector="ComboBox[SelectedIndex=-1] /template/ ContentControl">
-    <Setter Property="Content">
-      <Setter.Value>
-        <Template>
-          <TextBlock Text=" " />
-        </Template>
-      </Setter.Value>
-    </Setter>
-  </Style>
 </Styles>