diff --git a/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs
index 2ec53460..01001985 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs
@@ -112,9 +112,22 @@ namespace HandyControl.Controls
}
}
- IsError = !result.Data;
- ErrorStr = result.Message;
- return result.Data;
+ var isError = !result.Data;
+ if (isError)
+ {
+ SetCurrentValue(IsErrorProperty, true);
+ SetCurrentValue(ErrorStrProperty, result.Message);
+ }
+ else
+ {
+ isError = Validation.GetHasError(this);
+ if (isError)
+ {
+ SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent);
+ }
+ }
+
+ return !isError;
}
}
}
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml
index 50b1a932..b1357740 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml
@@ -40,6 +40,7 @@
+
@@ -255,6 +256,7 @@