整理
This commit is contained in:
@@ -1,17 +1,17 @@
|
||||
<ResourceDictionary
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:assists="clr-namespace:NeumUI.Assists"
|
||||
xmlns:controls="clr-namespace:NeumUI.Controls"
|
||||
xmlns:conv="clr-namespace:NeumUI.Converters"
|
||||
xmlns:svd="clr-namespace:NeumUI.Controls.Decorations"
|
||||
xmlns:assists="clr-namespace:NeoUI.Assists"
|
||||
xmlns:controls="clr-namespace:NeoUI.Controls"
|
||||
xmlns:conv="clr-namespace:NeoUI.Converters"
|
||||
xmlns:svd="clr-namespace:NeoUI.Controls.Decorations"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="pack://application:,,,/NeumUI;component/Controls/SymbolIcon.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/NeoUI;component/Controls/IconElement.xaml" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
|
||||
<Style
|
||||
BasedOn="{StaticResource SymbolIconStyle}"
|
||||
TargetType="controls:SymbolIcon"
|
||||
BasedOn="{StaticResource IconElementStyle}"
|
||||
TargetType="controls:IconElement"
|
||||
x:Key="ToolIcon">
|
||||
<!-- <Setter Property="Foreground" Value="{DynamicResource TextPrimaryBrush}" /> -->
|
||||
<!-- <Setter Property="FontSize" Value="16" /> -->
|
||||
@@ -42,6 +42,16 @@
|
||||
<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
|
||||
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
|
||||
<Setter Property="ContextMenu" Value="{DynamicResource TextBoxContextMenu}" />
|
||||
<Setter Property="Validation.ErrorTemplate">
|
||||
<Setter.Value>
|
||||
<ControlTemplate>
|
||||
<StackPanel>
|
||||
<AdornedElementPlaceholder Name="Adorner" />
|
||||
<TextBlock HorizontalAlignment="Right" Foreground="{DynamicResource ErrorBrush}" Text="{Binding ElementName=Adorner, Path=AdornedElement.(Validation.Errors)[0].ErrorContent}" />
|
||||
</StackPanel>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type TextBox}">
|
||||
@@ -125,7 +135,7 @@
|
||||
VerticalScrollBarVisibility="Hidden"
|
||||
x:Name="PART_ContentHost" />
|
||||
<!-- 清空按钮 -->
|
||||
<controls:SymbolIcon
|
||||
<controls:IconElement
|
||||
Grid.Column="2"
|
||||
Style="{StaticResource ToolIcon}"
|
||||
Symbol="Close"
|
||||
@@ -296,7 +306,7 @@
|
||||
VerticalScrollBarVisibility="Hidden"
|
||||
x:Name="PART_ContentHost" />
|
||||
<!-- 清空按钮 -->
|
||||
<controls:SymbolIcon
|
||||
<controls:IconElement
|
||||
Grid.Column="2"
|
||||
Style="{StaticResource ToolIcon}"
|
||||
Symbol="Close"
|
||||
|
||||
Reference in New Issue
Block a user