Browse Source

Merge branch 'master' into improve-viewbox

pull/5917/head
Dariusz Komosiński 5 years ago
committed by GitHub
parent
commit
074c3bda9f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Avalonia.Base/PropertyStore/BindingEntry.cs
  2. 14
      src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml

2
src/Avalonia.Base/PropertyStore/BindingEntry.cs

@ -79,7 +79,7 @@ namespace Avalonia.PropertyStore
public void OnError(Exception error) public void OnError(Exception error)
{ {
throw new NotImplementedException(); throw new NotImplementedException("BindingEntry.OnError is not implemented", error);
} }
public void OnNext(BindingValue<T> value) public void OnNext(BindingValue<T> value)

14
src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml

@ -27,14 +27,12 @@
<Style Selector="DataValidationErrors"> <Style Selector="DataValidationErrors">
<Style.Resources> <Style.Resources>
<DataTemplate x:Key="InlineDataValidationErrorTemplate"> <DataTemplate x:Key="InlineDataValidationErrorTemplate">
<ItemsControl Items="{Binding}"> <ItemsControl Items="{Binding}" TextBlock.Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}">
<ItemsControl.ItemTemplate> <ItemsControl.Styles>
<DataTemplate> <Style Selector="TextBlock">
<TextBlock Foreground="{DynamicResource SystemControlErrorTextForegroundBrush}" <Setter Property="TextWrapping" Value="Wrap" />
Text="{Binding}" </Style>
TextWrapping="Wrap" /> </ItemsControl.Styles>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl> </ItemsControl>
</DataTemplate> </DataTemplate>
<ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors"> <ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors">

Loading…
Cancel
Save