Browse Source
Merge branch 'master' into improve-viewbox
pull/5917/head
Dariusz Komosiński
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
7 additions and
9 deletions
-
src/Avalonia.Base/PropertyStore/BindingEntry.cs
-
src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
|
|
|
@ -79,7 +79,7 @@ namespace Avalonia.PropertyStore |
|
|
|
|
|
|
|
public void OnError(Exception error) |
|
|
|
{ |
|
|
|
throw new NotImplementedException(); |
|
|
|
throw new NotImplementedException("BindingEntry.OnError is not implemented", error); |
|
|
|
} |
|
|
|
|
|
|
|
public void OnNext(BindingValue<T> value) |
|
|
|
|
|
|
|
@ -27,14 +27,12 @@ |
|
|
|
<Style Selector="DataValidationErrors"> |
|
|
|
<Style.Resources> |
|
|
|
<DataTemplate x:Key="InlineDataValidationErrorTemplate"> |
|
|
|
<ItemsControl Items="{Binding}"> |
|
|
|
<ItemsControl.ItemTemplate> |
|
|
|
<DataTemplate> |
|
|
|
<TextBlock Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}" |
|
|
|
Text="{Binding}" |
|
|
|
TextWrapping="Wrap" /> |
|
|
|
</DataTemplate> |
|
|
|
</ItemsControl.ItemTemplate> |
|
|
|
<ItemsControl Items="{Binding}" TextBlock.Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}"> |
|
|
|
<ItemsControl.Styles> |
|
|
|
<Style Selector="TextBlock"> |
|
|
|
<Setter Property="TextWrapping" Value="Wrap" /> |
|
|
|
</Style> |
|
|
|
</ItemsControl.Styles> |
|
|
|
</ItemsControl> |
|
|
|
</DataTemplate> |
|
|
|
<ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors"> |
|
|
|
|