sync with net4.0

This commit is contained in:
NaBian committed 2021-07-17 23:49:47 +08:00
1 parent 4de0f713da
commit 965ea1a909
1 file changed
+2
@@ -514,6 +514,7 @@
<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}"/> <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}"/>
<Setter Property="Template" Value="{StaticResource ComboBoxTemplate}"/> <Setter Property="Template" Value="{StaticResource ComboBoxTemplate}"/>
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsEditable" Value="true"> <Trigger Property="IsEditable" Value="true">
<Setter Property="IsTabStop" Value="false"/> <Setter Property="IsTabStop" Value="false"/>
@@ -1291,6 +1292,7 @@
<!--Handy式下拉框样式--> <!--Handy式下拉框样式-->
<Style x:Key="ComboBoxPlusBaseStyle" BasedOn="{StaticResource ComboBoxExtendBaseStyle}" TargetType="hc:ComboBox"> <Style x:Key="ComboBoxPlusBaseStyle" BasedOn="{StaticResource ComboBoxExtendBaseStyle}" TargetType="hc:ComboBox">
<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}"/>
<Setter Property="Template" Value="{StaticResource ComboBoxPlusTopTemplate}"/> <Setter Property="Template" Value="{StaticResource ComboBoxPlusTopTemplate}"/>
<Style.Triggers> <Style.Triggers>
<MultiTrigger> <MultiTrigger>