Skip to content

Commit 5443601

Browse files
authored
Fix code style issues (#3730)
* Fix code style issues Converters N => V * Delete Obsolete Marked to be deleted in 5.0
1 parent c600683 commit 5443601

13 files changed

+21
-81
lines changed

src/MaterialDesignThemes.Wpf/Converters/NotZeroToVisibilityConverter.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
1414
}
1515

1616
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
17-
{
18-
return Binding.DoNothing;
19-
}
17+
=> Binding.DoNothing;
2018
}

src/MaterialDesignThemes.Wpf/Converters/NullableDateTimeToCurrentDateConverter.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,5 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
1313
}
1414

1515
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
16-
{
17-
return value;
18-
}
16+
=> value;
1917
}

src/MaterialDesignThemes.Wpf/Converters/NullableToVisibilityConverter.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,8 @@ public class NullableToVisibilityConverter : IValueConverter
99
public Visibility NotNullValue { get; set; } = Visibility.Visible;
1010

1111
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
12-
{
13-
return value == null ? NullValue : NotNullValue;
14-
}
12+
=> value == null ? NullValue : NotNullValue;
1513

1614
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
17-
{
18-
return Binding.DoNothing;
19-
}
15+
=> Binding.DoNothing;
2016
}

src/MaterialDesignThemes.Wpf/Converters/PointValueConverter.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
2121

2222
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
2323
{
24-
if (value is Point)
24+
if (value is Point point)
2525
{
26-
var point = (Point)value;
27-
return new object[] { point.X, point.Y };
26+
return [point.X, point.Y];
2827
}
2928

30-
return new object[0];
29+
return [];
3130
}
3231
}

src/MaterialDesignThemes.Wpf/Converters/RangeLengthConverter.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
1717

1818
return Binding.DoNothing;
1919

20-
var percent = (value - min) / (max - min);
21-
var length = percent * containerLength;
20+
double percent = (value - min) / (max - min);
21+
double length = percent * containerLength;
2222

2323
return length > containerLength ? containerLength : length;
2424
}
2525

2626
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
27-
{
28-
throw new NotImplementedException();
29-
}
27+
=> throw new NotImplementedException();
3028
}

src/MaterialDesignThemes.Wpf/Converters/RemoveAlphaBrushConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ private static Color RgbaToRgb(Color rgba, object background)
2525
_ => Colors.White
2626
};
2727

28-
var alpha = (double)rgba.A / byte.MaxValue;
29-
var alphaReverse = 1 - alpha;
28+
double alpha = (double)rgba.A / byte.MaxValue;
29+
double alphaReverse = 1 - alpha;
3030

3131
return Color.FromRgb(
3232
(byte)(alpha * rgba.R + alphaReverse * backgroundColor.R),

src/MaterialDesignThemes.Wpf/Converters/ShadowOpacityMaskConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class ShadowOpacityMaskConverter : IMultiValueConverter
2929

3030
double blurRadius = dropShadow.BlurRadius;
3131

32-
Rect rect = new Rect(
32+
var rect = new Rect(
3333
-blurRadius,
3434
-blurRadius,
3535
width + blurRadius + blurRadius,

src/MaterialDesignThemes.Wpf/Converters/SizeToRectConverter.cs

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/MaterialDesignThemes.Wpf/Converters/SliderValueLabelPositionConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
1616
{
1717
Orientation.Horizontal => (-width * 0.5) + halfGripWidth,
1818
Orientation.Vertical => -width - margin,
19-
_ => throw new ArgumentOutOfRangeException()
19+
_ => throw new ArgumentOutOfRangeException(nameof(parameter))
2020
};
2121
}
2222

src/MaterialDesignThemes.Wpf/Converters/SnackbarMessageTypeConverter.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ namespace MaterialDesignThemes.Wpf.Converters;
66
public class SnackbarMessageTypeConverter : TypeConverter
77
{
88
public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
9-
{
10-
return sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
11-
}
9+
=> sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
1210

1311
public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
1412
{

0 commit comments

Comments
 (0)