diff --git a/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs b/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs index b298fbf2e1..b2433bfd97 100644 --- a/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs +++ b/src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs @@ -15,7 +15,7 @@ namespace Avalonia.Controls.Converters /// Gets or sets the corners to filter by. /// Only the specified corners will be included in the converted . /// - public CornerRadiusCorner Filter { get; set; } + public Corners Filter { get; set; } /// /// Gets or sets the scale multiplier applied uniformly to each corner. @@ -30,10 +30,10 @@ namespace Avalonia.Controls.Converters } return new CornerRadius( - Filter.HasAllFlags(CornerRadiusCorner.TopLeft) ? radius.TopLeft * Scale : 0, - Filter.HasAllFlags(CornerRadiusCorner.TopRight) ? radius.TopRight * Scale : 0, - Filter.HasAllFlags(CornerRadiusCorner.BottomRight) ? radius.BottomRight * Scale : 0, - Filter.HasAllFlags(CornerRadiusCorner.BottomLeft) ? radius.BottomLeft * Scale : 0); + Filter.HasAllFlags(Corners.TopLeft) ? radius.TopLeft * Scale : 0, + Filter.HasAllFlags(Corners.TopRight) ? radius.TopRight * Scale : 0, + Filter.HasAllFlags(Corners.BottomRight) ? radius.BottomRight * Scale : 0, + Filter.HasAllFlags(Corners.BottomLeft) ? radius.BottomLeft * Scale : 0); } public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) diff --git a/src/Avalonia.Controls/Converters/CornerRadiusToDoubleConverter.cs b/src/Avalonia.Controls/Converters/CornerRadiusToDoubleConverter.cs index 2d549504ff..6da15b61e6 100644 --- a/src/Avalonia.Controls/Converters/CornerRadiusToDoubleConverter.cs +++ b/src/Avalonia.Controls/Converters/CornerRadiusToDoubleConverter.cs @@ -12,7 +12,7 @@ namespace Avalonia.Controls.Converters /// /// Gets or sets the specific corner of the to convert to double. /// - public CornerRadiusCorner Corner { get; set; } + public Corners Corner { get; set; } /// public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) @@ -24,13 +24,13 @@ namespace Avalonia.Controls.Converters switch (Corner) { - case CornerRadiusCorner.TopLeft: + case Corners.TopLeft: return cornerRadius.TopLeft; - case CornerRadiusCorner.TopRight: + case Corners.TopRight: return cornerRadius.TopRight; - case CornerRadiusCorner.BottomRight: + case Corners.BottomRight: return cornerRadius.BottomRight; - case CornerRadiusCorner.BottomLeft: + case Corners.BottomLeft: return cornerRadius.BottomLeft; default: return 0.0; diff --git a/src/Avalonia.Controls/Converters/CornerRadiusCorner.cs b/src/Avalonia.Controls/Converters/Corners.cs similarity index 83% rename from src/Avalonia.Controls/Converters/CornerRadiusCorner.cs rename to src/Avalonia.Controls/Converters/Corners.cs index 205dd12f48..22ac4cb5f9 100644 --- a/src/Avalonia.Controls/Converters/CornerRadiusCorner.cs +++ b/src/Avalonia.Controls/Converters/Corners.cs @@ -3,10 +3,10 @@ namespace Avalonia.Controls.Converters { /// - /// Defines constants that specify the corner of a . + /// Defines constants that specify one or more corners of a . /// [Flags] - public enum CornerRadiusCorner + public enum Corners { /// /// No corner.