From 2523e7a2901aba996224d978ab729fd028fa4153 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Tue, 16 Jul 2019 22:37:30 +0200 Subject: [PATCH] Remove IMutablePen. It's not really needed. Mutable pens will always be `Pen`s. --- src/Avalonia.Visuals/Media/BrushExtensions.cs | 2 +- src/Avalonia.Visuals/Media/IMutablePen.cs | 17 ----------------- src/Avalonia.Visuals/Media/Pen.cs | 2 +- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 src/Avalonia.Visuals/Media/IMutablePen.cs diff --git a/src/Avalonia.Visuals/Media/BrushExtensions.cs b/src/Avalonia.Visuals/Media/BrushExtensions.cs index 265337476a..87e698e705 100644 --- a/src/Avalonia.Visuals/Media/BrushExtensions.cs +++ b/src/Avalonia.Visuals/Media/BrushExtensions.cs @@ -50,7 +50,7 @@ namespace Avalonia.Media { Contract.Requires(pen != null); - return pen as ImmutablePen ?? ((IMutablePen)pen).ToImmutable(); + return pen as ImmutablePen ?? ((Pen)pen).ToImmutable(); } } } diff --git a/src/Avalonia.Visuals/Media/IMutablePen.cs b/src/Avalonia.Visuals/Media/IMutablePen.cs deleted file mode 100644 index 8b02929dec..0000000000 --- a/src/Avalonia.Visuals/Media/IMutablePen.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using Avalonia.Media.Immutable; - -namespace Avalonia.Media -{ - /// - /// Represents a mutable pen which can return an immutable clone of itself. - /// - public interface IMutablePen : IPen, IAffectsRender - { - /// - /// Creates an immutable clone of the pen. - /// - /// The immutable clone. - ImmutablePen ToImmutable(); - } -} diff --git a/src/Avalonia.Visuals/Media/Pen.cs b/src/Avalonia.Visuals/Media/Pen.cs index c0963adc08..fdf006e054 100644 --- a/src/Avalonia.Visuals/Media/Pen.cs +++ b/src/Avalonia.Visuals/Media/Pen.cs @@ -11,7 +11,7 @@ namespace Avalonia.Media /// /// Describes how a stroke is drawn. /// - public class Pen : AvaloniaObject, IMutablePen, IEquatable + public class Pen : AvaloniaObject, IPen, IEquatable { /// /// Defines the property.