Merge pull request #978 from tmijail/ComboBoxWhitespace

Eliminate un-selectable space between ComboBoxItems
lepoco · Mar 13, 2024 · 95072e4 · 95072e4
2 parents 90ee893 + f9eed39
commit 95072e4
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
@@ -20,7 +20,7 @@
     <Thickness x:Key="ComboBoxBorderThemeThickness">1,1,1,1</Thickness>
     <Thickness x:Key="ComboBoxAccentBorderThemeThickness">0,0,0,2</Thickness>
     <Thickness x:Key="ComboBoxChevronMargin">8,0,10,0</Thickness>
-    <Thickness x:Key="ComboBoxItemMargin">3,2,3,0</Thickness>
+    <Thickness x:Key="ComboBoxItemMargin">6,4,6,0</Thickness>
     <Thickness x:Key="ComboBoxItemContentMargin">10,8,8,8</Thickness>
     <system:Double x:Key="ComboBoxChevronSize">11.0</system:Double>
     <system:Double x:Key="ComboBoxPopupMinHeight">32.0</system:Double>
@@ -92,7 +92,6 @@
         <!--  Universal WPF UI focus  -->
         <Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Margin" Value="{StaticResource ComboBoxItemMargin}" />
         <Setter Property="Padding" Value="{StaticResource ComboBoxItemContentMargin}" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
@@ -101,10 +100,10 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-                    <Grid>
+                    <Grid Background="Transparent">
                         <Border
                             Name="ContentBorder"
-                            Margin="{TemplateBinding Margin}"
+                            Margin="{DynamicResource ComboBoxItemMargin}"
                             Padding="0"
                             VerticalAlignment="Stretch"
                             CornerRadius="{TemplateBinding Border.CornerRadius}"