add TextBox control

now you can clear and verify the text of textbox

HandyControl/Controls/Clock/Clock.cs

@@ -98,7 +98,7 @@ namespace HandyControl.Controls
         #region Public Properties
 
         public static readonly DependencyProperty SelectedTimeProperty = DependencyProperty.Register(
-            "SelectedTime", typeof(DateTime?), typeof(Clock), new PropertyMetadata(default(DateTime), OnSelectedTimeChanged));
+            "SelectedTime", typeof(DateTime?), typeof(Clock), new PropertyMetadata(default(DateTime?), OnSelectedTimeChanged));
 
         private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
@@ -239,6 +239,17 @@ namespace HandyControl.Controls
             }
 
             _appliedTemplate = true;
+            if (_isLoaded)
+            {
+                if (SelectedTime.HasValue)
+                {
+                    Update(SelectedTime.Value);
+                }
+                else
+                {
+                    DisplayTime = DateTime.Now;
+                }
+            }
         }
 
         #endregion Public Methods

HandyControl/Controls/ColorPicker.cs

@@ -9,7 +9,6 @@ using HandyControl.Data;
 using HandyControl.Interactivity;
 using HandyControl.Tools.Extension;
 
-// ReSharper disable once CheckNamespace
 namespace HandyControl.Controls
 {
     /// <summary>
@@ -359,6 +358,8 @@ namespace HandyControl.Controls
                 _sliderOpacity.ValueChanged -= SliderOpacity_OnValueChanged;
             }
 
+            _panelColor?.Children.Clear();
+
             _panelRgb?.RemoveHandler(NumericUpDown.ValueChangedEvent, new EventHandler<FunctionEventArgs<double>>(NumericUpDownRgb_OnValueChanged));
 
             base.OnApplyTemplate();
@@ -391,6 +392,10 @@ namespace HandyControl.Controls
                 collection.Add(behavior);
             }
 
+            if (_isLoaded)
+            {
+                Init();
+            }
             _panelRgb?.AddHandler(NumericUpDown.ValueChangedEvent, new EventHandler<FunctionEventArgs<double>>(NumericUpDownRgb_OnValueChanged));
         }
 

HandyControl/Controls/IDataInput.cs

@@ -1,23 +0,0 @@
-using System;
-using HandyControl.Data;
-
-namespace HandyControl.Controls
-{
-    /// <summary>
-    ///     表示可以成为一个数据输入控件
-    /// </summary>
-    public interface IDataInput
-    {
-        bool VerifyData();
-
-        Func<string, OperationResult<bool>> VerifyFunc { get; set; }
-
-        bool IsError { get; set; }
-
-        string ErrorStr { get; set; }
-
-        TextType TextType { get; set; }
-
-        bool ShowClearButton { get; set; }
-    }
-}

HandyControl/Controls/Input/IDataInput.cs

@@ -0,0 +1,43 @@
+using System;
+using HandyControl.Data;
+
+// ReSharper disable once CheckNamespace
+namespace HandyControl.Controls
+{
+    /// <summary>
+    ///     表示可以成为一个数据输入控件
+    /// </summary>
+    public interface IDataInput
+    {
+        /// <summary>
+        ///     验证数据
+        /// </summary>
+        /// <returns></returns>
+        bool VerifyData();
+
+        /// <summary>
+        ///     数据验证委托
+        /// </summary>
+        Func<string, OperationResult<bool>> VerifyFunc { get; set; }
+
+        /// <summary>
+        ///     数据是否错误
+        /// </summary>
+        bool IsError { get; set; }
+
+        /// <summary>
+        ///     错误提示
+        /// </summary>
+        string ErrorStr { get; set; }
+
+        /// <summary>
+        ///     文本类型
+        /// </summary>
+        TextType TextType { get; set; }
+
+        /// <summary>
+        ///     是否显示清除按钮
+        /// </summary>
+        bool ShowClearButton { get; set; }
+    }
+}

HandyControl/Controls/Input/NumericUpDown.cs

@@ -5,8 +5,10 @@ using System.Windows.Input;
 using HandyControl.Data;
 using HandyControl.Interactivity;
 
+// ReSharper disable once CheckNamespace
 namespace HandyControl.Controls
 {
+    /// <inheritdoc cref="IDataInput" />
     /// <summary>
     ///     数值选择控件
     /// </summary>
@@ -25,6 +27,11 @@ namespace HandyControl.Controls
 
         #endregion Data
 
+        static NumericUpDown()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(NumericUpDown), new FrameworkPropertyMetadata(typeof(NumericUpDown)));
+        }
+
         public NumericUpDown()
         {
             CommandBindings.Add(new CommandBinding(ControlCommands.Prev, (s, e) =>
@@ -44,6 +51,8 @@ namespace HandyControl.Controls
                 ClearValue(ValueProperty);
                 _textBox.Text = string.Empty;
             }));
+
+            Loaded += (s, e) => OnApplyTemplate();
         }
 
         protected override void OnGotFocus(RoutedEventArgs e)
@@ -309,9 +318,6 @@ namespace HandyControl.Controls
         public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
             "IsError", typeof(bool), typeof(NumericUpDown), new PropertyMetadata(default(bool)));
 
-        /// <summary>
-        ///     数据是否错误
-        /// </summary>
         public bool IsError
         {
             get => (bool) GetValue(IsErrorProperty);
@@ -324,9 +330,6 @@ namespace HandyControl.Controls
         public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
             "ErrorStr", typeof(string), typeof(NumericUpDown), new PropertyMetadata(default(string)));
 
-        /// <summary>
-        ///     错误提示
-        /// </summary>
         public string ErrorStr
         {
             get => (string) GetValue(ErrorStrProperty);
@@ -339,9 +342,6 @@ namespace HandyControl.Controls
         public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
             "TextType", typeof(TextType), typeof(NumericUpDown), new PropertyMetadata(default(TextType)));
 
-        /// <summary>
-        ///     文本类型
-        /// </summary>
         public TextType TextType
         {
             get => (TextType) GetValue(TextTypeProperty);
@@ -354,24 +354,14 @@ namespace HandyControl.Controls
         public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
             "ShowClearButton", typeof(bool), typeof(NumericUpDown), new PropertyMetadata(default(bool)));
 
-        /// <summary>
-        ///     是否显示清除按钮
-        /// </summary>
         public bool ShowClearButton
         {
             get => (bool) GetValue(ShowClearButtonProperty);
             set => SetValue(ShowClearButtonProperty, value);
         }
 
-        /// <summary>
-        ///     数据验证委托
-        /// </summary>
         public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
 
-        /// <summary>
-        ///     验证数据
-        /// </summary>
-        /// <returns></returns>
         public virtual bool VerifyData()
         {
             OperationResult<bool> result;

HandyControl/Controls/Input/TextBox.cs

@@ -1,8 +1,115 @@
-// ReSharper disable once CheckNamespace
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using HandyControl.Data;
+using HandyControl.Interactivity;
+using HandyControl.Tools;
+
+// ReSharper disable once CheckNamespace
 namespace HandyControl.Controls
 {
-    public class TextBox : System.Windows.Controls.TextBox
+    public class TextBox : System.Windows.Controls.TextBox, IDataInput
     {
-        
+        public TextBox()
+        {
+            CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
+            {
+                ClearValue(TextProperty);
+                Text = string.Empty;
+            }));
+        }
+
+        protected override void OnTextChanged(TextChangedEventArgs e)
+        {
+            base.OnTextChanged(e);
+            VerifyData();
+        }
+
+        public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
+
+        /// <summary>
+        ///     数据是否错误
+        /// </summary>
+        public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
+            "IsError", typeof(bool), typeof(TextBox), new PropertyMetadata(default(bool)));
+
+        public bool IsError
+        {
+            get => (bool) GetValue(IsErrorProperty);
+            set => SetValue(IsErrorProperty, value);
+        }
+
+        /// <summary>
+        ///     错误提示
+        /// </summary>
+        public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
+            "ErrorStr", typeof(string), typeof(TextBox), new PropertyMetadata(default(string)));
+
+        public string ErrorStr
+        {
+            get => (string) GetValue(ErrorStrProperty);
+            set => SetValue(ErrorStrProperty, value);
+        }
+
+        /// <summary>
+        ///     文本类型
+        /// </summary>
+        public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
+            "TextType", typeof(TextType), typeof(TextBox), new PropertyMetadata(default(TextType)));
+
+        public TextType TextType
+        {
+            get => (TextType) GetValue(TextTypeProperty);
+            set => SetValue(TextTypeProperty, value);
+        }
+
+        /// <summary>
+        ///     是否显示清除按钮
+        /// </summary>
+        public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
+            "ShowClearButton", typeof(bool), typeof(TextBox), new PropertyMetadata(default(bool)));
+
+        public bool ShowClearButton
+        {
+            get => (bool) GetValue(ShowClearButtonProperty);
+            set => SetValue(ShowClearButtonProperty, value);
+        }
+
+        public virtual bool VerifyData()
+        {
+            OperationResult<bool> result;
+
+            if (VerifyFunc != null)
+            {
+                result = VerifyFunc.Invoke(Text);
+            }
+            else
+            {
+                if (!string.IsNullOrEmpty(Text))
+                {
+                    if (TextType != TextType.Common)
+                    {
+                        result = Text.IsKindOf(TextType) ? OperationResult.Success() : OperationResult.Failed(Properties.Langs.Lang.FormatError);
+                    }
+                    else
+                    {
+                        result = OperationResult.Success();
+                    }
+                }
+                else if (InfoElement.GetNecessary(this))
+                {
+                    result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
+                }
+                else
+                {
+                    result = OperationResult.Success();
+                }
+            }
+
+            IsError = !result.Data;
+            ErrorStr = result.Message;
+            return result.Data;
+        }
     }
 }

HandyControl/Controls/Loading/LoadingLine.cs

@@ -7,9 +7,6 @@ using System.Windows.Shapes;
 // ReSharper disable once CheckNamespace
 namespace HandyControl.Controls
 {
-    /// <summary>
-    ///     LoadingLine.xaml 的交互逻辑
-    /// </summary>
     public class LoadingLine : LoadingBase
     {
         private const double MoveLength = 80;

HandyControl/Controls/Steps/StepBar.cs

@@ -67,12 +67,18 @@ namespace HandyControl.Controls
 
         public override void OnApplyTemplate()
         {
+            _panelMain?.Children.Clear();
             base.OnApplyTemplate();
 
             _progressBarBack = GetTemplateChild(ElementProgressBarBack) as ProgressBar;
             _panelMain = GetTemplateChild(ElementUniformGridMain) as Panel;
 
             CheckNull();
+
+            if (_isLoaded)
+            {
+                UpdateItems(Items);
+            }
         }
 
         private void CheckNull()

HandyControl/Controls/TimeBar/TimeBar.cs

@@ -150,12 +150,14 @@ namespace HandyControl.Controls
         /// </summary>
         private double _totalOffsetX;
 
+        private readonly bool _isLoaded;
+
         public TimeBar()
         {
             _starTime = DateTime.Now;
             SelectedTime = new DateTime(_starTime.Year, _starTime.Month, _starTime.Day, 0, 0, 0);
             _starTime = SelectedTime;
-
+            _isLoaded = true;
             SizeChanged += TimeBar_OnSizeChanged;
             MouseMove += TimeBar_OnMouseMove;
         }
@@ -188,6 +190,10 @@ namespace HandyControl.Controls
             var collection = Interaction.GetBehaviors(_borderTop);
             collection.Add(behavior);
 
+            if (_isLoaded)
+            {
+                TimeBar_OnSizeChanged(null, null);
+            }
             _textBlockSelected.Text = SelectedTime.ToString(TimeFormat);
         }
 

HandyControl/HandyControl.csproj

@@ -51,14 +51,14 @@
     <Compile Include="Controls\Clock\Clock.cs" />
     <Compile Include="Controls\Clock\ClockRadioButton.cs" />
     <Compile Include="Controls\Growl.cs" />
-    <Compile Include="Controls\IDataInput.cs" />
+    <Compile Include="Controls\Input\IDataInput.cs" />
     <Compile Include="Controls\Input\TextBox.cs" />
     <Compile Include="Controls\ISingleOpen.cs" />
-    <Compile Include="Controls\NumericUpDown.cs" />
+    <Compile Include="Controls\Input\NumericUpDown.cs" />
     <Compile Include="Controls\Pagination.cs" />
     <Compile Include="Controls\Attach\IconElement.cs" />
     <Compile Include="Controls\Slider\CompareSlider.cs" />
-    <Compile Include="Controls\Picker\ColorPicker.cs" />
+    <Compile Include="Controls\ColorPicker.cs" />
     <Compile Include="Controls\Slider\PreviewSlider.cs" />
     <Compile Include="Controls\ScrollViewer.cs" />
     <Compile Include="Controls\Loading\LoadingBase.cs" />
@@ -116,7 +116,7 @@
     <Compile Include="Controls\TabControl\TabItem.cs" />
     <Compile Include="Controls\TabControl\TabPanel.cs" />
     <Compile Include="Controls\TimeBar\SpeTextBlock.cs" />
-    <Compile Include="Controls\Picker\TimePicker.cs" />
+    <Compile Include="Controls\Input\TimePicker.cs" />
     <Compile Include="Controls\TimeBar\TimeBar.cs" />
     <Compile Include="Controls\TransitioningContentControl.cs" />
     <Compile Include="Controls\WatermarkTextBox.cs" />

HandyControl/Themes/Styles/Slider.xaml

@@ -452,7 +452,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="RepeatButton">
                     <Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-                        <Rectangle Fill="{TemplateBinding Background}" Height="2"/>
+                        <Rectangle StrokeThickness="0" Fill="{TemplateBinding Background}" Height="2"/>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
@@ -468,7 +468,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="RepeatButton">
                     <Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-                        <Rectangle Fill="{TemplateBinding Background}" Width="2"/>
+                        <Rectangle StrokeThickness="0" Fill="{TemplateBinding Background}" Width="2"/>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
@@ -646,7 +646,7 @@
                     <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}"/>
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
-                    <Thumb ClipToBounds="False" Width="18" Margin="-9,0,-9,0" Height="18" x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" VerticalAlignment="Center"/>
+                    <Thumb ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" VerticalAlignment="Center"/>
                 </Track.Thumb>
             </Track>
         </Grid>
@@ -701,7 +701,7 @@
                     <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}"/>
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
-                    <Thumb Margin="0,-9" x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" VerticalAlignment="Top" Width="18"/>
+                    <Thumb Margin="0,-9" x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" HorizontalAlignment="Center" Width="18"/>
                 </Track.Thumb>
             </Track>
         </Grid>
@@ -722,11 +722,9 @@
             </MultiTrigger>
             <Trigger Property="TickPlacement" Value="TopLeft">
                 <Setter Property="Visibility" TargetName="TopTick" Value="Visible"/>
-                <Setter Property="Margin" TargetName="TrackBackground" Value="2,5,0,5"/>
             </Trigger>
             <Trigger Property="TickPlacement" Value="BottomRight">
                 <Setter Property="Visibility" TargetName="BottomTick" Value="Visible"/>
-                <Setter Property="Margin" TargetName="TrackBackground" Value="0,5,2,5"/>
             </Trigger>
             <Trigger Property="TickPlacement" Value="Both">
                 <Setter Property="Visibility" TargetName="TopTick" Value="Visible"/>

HandyControl/Themes/Styles/TextBox.xaml

@@ -1,9 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+                    xmlns:system="clr-namespace:System;assembly=mscorlib"
+                    xmlns:interactivity="clr-namespace:HandyControl.Interactivity">
 
     <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../Basic/Geometries.xaml"/>
+        <ResourceDictionary Source="Button.xaml"/>
         <ResourceDictionary Source="Base/TextBoxBaseStyle.xaml"/>
         <ResourceDictionary Source="TextBlock.xaml"/>
     </ResourceDictionary.MergedDictionaries>
@@ -80,55 +83,121 @@
     </Style>
 
     <ControlTemplate x:Key="TextBoxPlusTopTemplate" TargetType="controls:TextBox">
+        <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardShow">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="8,0,0,-18" Duration="0:0:.2"/>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardHidden">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="8,0,0,4" Duration="0:0:0"/>
+            </Storyboard>
+        </ControlTemplate.Resources>
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="{Binding Path=(controls:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}"/>
             </Grid.RowDefinitions>
-            <StackPanel Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" Margin="7,4">
+            <TextBlock Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="8,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1"/>
+            <StackPanel Grid.Row="0" Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" Margin="7,4">
                 <TextBlock Foreground="{DynamicResource PrimaryTextBrush}" Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
-            <Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
-            <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="8" Grid.Row="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
-            <ScrollViewer Padding="7,0" Margin="1,1,1,2" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+            <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                <Grid SnapsToDevicePixels="true">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="7,8" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
+                    <ScrollViewer Grid.Column="0" Padding="7,0" Margin="0,0,0,1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                    <Button Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" controls:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
+                </Grid>
+            </Border>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" TargetName="border" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
             </Trigger>
-            <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}"/>
+            <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
             <Trigger Property="IsFocused" Value="true">
-                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}"/>
+                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}"/>
+            </Trigger>
+            <Trigger Property="IsError" Value="true">
+                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}"/>
+                <Trigger.EnterActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
+                </Trigger.ExitActions>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <ControlTemplate x:Key="TextBoxPlusLeftTemplate" TargetType="controls:TextBox">
+        <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardShow">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="8,0,0,-18" Duration="0:0:.2"/>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardHidden">
+                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="8,0,0,4" Duration="0:0:0"/>
+            </Storyboard>
+        </ControlTemplate.Resources>
         <Grid Height="{Binding Path=(controls:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="{Binding Path=(controls:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <StackPanel Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,7,6,8">
+            <TextBlock Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="8,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1"/>
+            <StackPanel Grid.Column="0" Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,7,6,8">
                 <TextBlock Foreground="{DynamicResource PrimaryTextBrush}" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
-            <Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
-            <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="8,7,8,8" Grid.Column="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
-            <ScrollViewer Grid.Column="1" Padding="7,0" Margin="1,1,1,2" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+            <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                <Grid SnapsToDevicePixels="true">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="7,8" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
+                    <ScrollViewer Grid.Column="0" Padding="7,0" Margin="0,0,0,1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                    <Button Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" controls:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
+                </Grid>
+            </Border>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" TargetName="border" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
             </Trigger>
-            <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}"/>
+            <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot"/>
+                    <Condition Property="ShowClearButton" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
+            </MultiTrigger>
             <Trigger Property="IsFocused" Value="true">
-                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}"/>
+                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}"/>
+            </Trigger>
+            <Trigger Property="IsError" Value="true">
+                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}"/>
+                <Trigger.EnterActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
+                </Trigger.ExitActions>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>