Browse Source

Made Path/PathIcon.Data nullable (#14720)

pull/14736/head
Julien Lebosquain 2 years ago
committed by GitHub
parent
commit
ca4a672be2
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 6
      src/Avalonia.Controls/PathIcon.cs
  2. 10
      src/Avalonia.Controls/Shapes/Path.cs

6
src/Avalonia.Controls/PathIcon.cs

@ -9,10 +9,10 @@ namespace Avalonia.Controls
AffectsRender<PathIcon>(DataProperty); AffectsRender<PathIcon>(DataProperty);
} }
public static readonly StyledProperty<Geometry> DataProperty = public static readonly StyledProperty<Geometry?> DataProperty =
AvaloniaProperty.Register<PathIcon, Geometry>(nameof(Data)); AvaloniaProperty.Register<PathIcon, Geometry?>(nameof(Data));
public Geometry Data public Geometry? Data
{ {
get => GetValue(DataProperty); get => GetValue(DataProperty);
set => SetValue(DataProperty, value); set => SetValue(DataProperty, value);

10
src/Avalonia.Controls/Shapes/Path.cs

@ -5,8 +5,8 @@ namespace Avalonia.Controls.Shapes
{ {
public class Path : Shape public class Path : Shape
{ {
public static readonly StyledProperty<Geometry> DataProperty = public static readonly StyledProperty<Geometry?> DataProperty =
AvaloniaProperty.Register<Path, Geometry>(nameof(Data)); AvaloniaProperty.Register<Path, Geometry?>(nameof(Data));
private EventHandler? _geometryChangedHandler; private EventHandler? _geometryChangedHandler;
@ -16,15 +16,15 @@ namespace Avalonia.Controls.Shapes
DataProperty.Changed.AddClassHandler<Path>((o, e) => o.DataChanged(e)); DataProperty.Changed.AddClassHandler<Path>((o, e) => o.DataChanged(e));
} }
public Geometry Data public Geometry? Data
{ {
get => GetValue(DataProperty); get => GetValue(DataProperty);
set => SetValue(DataProperty, value); set => SetValue(DataProperty, value);
} }
private EventHandler? GeometryChangedHandler => _geometryChangedHandler ??= GeometryChanged; private EventHandler GeometryChangedHandler => _geometryChangedHandler ??= GeometryChanged;
protected override Geometry CreateDefiningGeometry() => Data; protected override Geometry? CreateDefiningGeometry() => Data;
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{ {

Loading…
Cancel
Save