Browse Source

Update ComboBox.xaml

Symbai 5 years ago
parent
commit
10ad9eb7ed
1 changed files with 19 additions and 10 deletions
  1. 19 10
      src/Avalonia.Themes.Default/ComboBox.xaml

+ 19 - 10
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>