diff --git a/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs index 6cd44d2e..d09a45ab 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs @@ -357,9 +357,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/ComboBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml index 44e7cad6..d436de7d 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml @@ -556,6 +556,7 @@ + @@ -1375,6 +1376,7 @@