Browse Source

Rename 'CornerRadiusCorner' to 'Corners'

pull/7842/head
robloo 5 years ago
parent
commit
13857d5645
  1. 10
      src/Avalonia.Controls/Converters/CornerRadiusFilterConverter.cs
  2. 10
      src/Avalonia.Controls/Converters/CornerRadiusToDoubleConverter.cs
  3. 4
      src/Avalonia.Controls/Converters/Corners.cs

10
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 <see cref="CornerRadius"/>.
/// </summary>
public CornerRadiusCorner Filter { get; set; }
public Corners Filter { get; set; }
/// <summary>
/// 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)

10
src/Avalonia.Controls/Converters/CornerRadiusToDoubleConverter.cs

@ -12,7 +12,7 @@ namespace Avalonia.Controls.Converters
/// <summary>
/// Gets or sets the specific corner of the <see cref="CornerRadius"/> to convert to double.
/// </summary>
public CornerRadiusCorner Corner { get; set; }
public Corners Corner { get; set; }
/// <inheritdoc/>
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;

4
src/Avalonia.Controls/Converters/CornerRadiusCorner.cs → src/Avalonia.Controls/Converters/Corners.cs

@ -3,10 +3,10 @@
namespace Avalonia.Controls.Converters
{
/// <summary>
/// Defines constants that specify the corner of a <see cref="CornerRadius"/>.
/// Defines constants that specify one or more corners of a <see cref="CornerRadius"/>.
/// </summary>
[Flags]
public enum CornerRadiusCorner
public enum Corners
{
/// <summary>
/// No corner.
Loading…
Cancel
Save