Skip to content

Commit 5dc8c1b

Browse files
committed
Add other ComboBox templates
1 parent 64a3693 commit 5dc8c1b

File tree

3 files changed

+362
-365
lines changed

3 files changed

+362
-365
lines changed

MaterialDesignThemes.Wpf/Converters/MathConverter.cs

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,20 @@ public sealed class MathConverter : IValueConverter
2222

2323
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
2424
{
25-
if (value is int)
25+
double value1, value2;
26+
if (Double.TryParse(value.ToString(), out value1) && Double.TryParse(parameter.ToString(), out value2))
2627
{
2728
switch (Operation)
2829
{
2930
default:
3031
case MathOperation.Add:
31-
return (int)value + System.Convert.ToInt32(parameter);
32+
return value1 + value2;
3233
case MathOperation.Divide:
33-
return (int)value / System.Convert.ToInt32(parameter);
34+
return value1 / value2;
3435
case MathOperation.Multiply:
35-
return (int)value * System.Convert.ToInt32(parameter);
36+
return value1 * value2;
3637
case MathOperation.Sub:
37-
return (int)value + System.Convert.ToInt32(parameter);
38-
}
39-
}
40-
41-
if (value is double)
42-
{
43-
switch (Operation)
44-
{
45-
default:
46-
case MathOperation.Add:
47-
return (double)value + System.Convert.ToDouble(parameter);
48-
case MathOperation.Divide:
49-
return (double)value / System.Convert.ToDouble(parameter);
50-
case MathOperation.Multiply:
51-
return (double)value * System.Convert.ToDouble(parameter);
52-
case MathOperation.Sub:
53-
return (double)value + System.Convert.ToDouble(parameter);
38+
return value1 - value2;
5439
}
5540
}
5641

MaterialDesignThemes.Wpf/Converters/MathMultipleConverter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public object Convert(object[] value, Type targetType, object parameter, Culture
1818
double value1, value2;
1919
if (Double.TryParse(value[0].ToString(), out value1) && Double.TryParse(value[1].ToString(), out value2))
2020
{
21-
Debug.WriteLine($"value1: {value1} value2: {value2}");
2221
switch (Operation)
2322
{
2423
default:

0 commit comments

Comments
 (0)