|
843 | 843 | </ControlTemplate>
|
844 | 844 |
|
845 | 845 | <Style x:Key="MaterialDesignComboBox" TargetType="{x:Type ComboBox}">
|
846 |
| - <Setter Property="wpf:ComboBoxAssist.ShowSelectedItem" Value="False" /> |
| 846 | + <Setter Property="wpf:ComboBoxAssist.ShowSelectedItem" Value="True"/> |
847 | 847 | <Setter Property="Background" Value="Transparent"/>
|
848 | 848 | <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextBoxBorder}"/>
|
849 | 849 | <Setter Property="BorderThickness" Value="0 0 0 1"/>
|
850 | 850 | <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
|
851 | 851 | <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
|
852 |
| - <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignComboBoxItemSelectedCollapsedStyle}" /> |
| 852 | + <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignComboBoxItemStyle}" /> |
853 | 853 | <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
|
854 | 854 | <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
|
855 | 855 | <Setter Property="Padding" Value="{x:Static wpf:Constants.TextBoxDefaultPadding}" />
|
|
873 | 873 | <Setter Property="wpf:ComboBoxAssist.ShowSelectedItem" Value="{StaticResource TrueValue}" />
|
874 | 874 | </Trigger>
|
875 | 875 | <!-- designer prefers hard bool -->
|
876 |
| - <Trigger Property="wpf:ComboBoxAssist.ShowSelectedItem" Value="{StaticResource TrueValue}" > |
877 |
| - <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignComboBoxItemStyle}" /> |
| 876 | + <Trigger Property="wpf:ComboBoxAssist.ShowSelectedItem" Value="{StaticResource FalseValue}" > |
| 877 | + <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignComboBoxItemSelectedCollapsedStyle}" /> |
878 | 878 | </Trigger>
|
879 | 879 | </Style.Triggers>
|
880 | 880 | </Style>
|
|
887 | 887 |
|
888 | 888 | <Style x:Key="MaterialDesignFilledComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource MaterialDesignFloatingHintComboBox}">
|
889 | 889 | <Setter Property="wpf:TextFieldAssist.TextFieldCornerRadius" Value="4,4,0,0" />
|
890 |
| - <Setter Property="wpf:ComboBoxAssist.ShowSelectedItem" Value="False" /> |
| 890 | + <Setter Property="wpf:ComboBoxAssist.ShowSelectedItem" Value="True"/> |
891 | 891 | <Setter Property="VerticalContentAlignment" Value="Stretch" />
|
892 | 892 | <Setter Property="VerticalAlignment" Value="Stretch" />
|
893 | 893 | <Setter Property="Padding" Value="12,8,8,8" />
|
|
0 commit comments