Skip to content

Commit 0f0f90d

Browse files
committed
give the converter a more meaningful name
1 parent e9b41de commit 0f0f90d

File tree

5 files changed

+49
-46
lines changed

5 files changed

+49
-46
lines changed

MainDemo.Wpf/TextFields.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,14 @@
203203
Style="{StaticResource MaterialDesignFloatingHintPasswordBox}" />
204204

205205
<TextBox Grid.Row="6" Grid.Column="3"
206-
materialDesign:HintAssist.Hint="Large Font Size"
207-
materialDesign:HintAssist.FloatingScale="0.54"
208-
materialDesign:HintAssist.FloatingOffset="1,-54"
209-
Text="Some Text"
210-
Style="{StaticResource MaterialDesignFloatingHintTextBox}"
211-
FontSize="24"/>
212-
213-
206+
materialDesign:HintAssist.Hint="Large Font"
207+
materialDesign:TextFieldAssist.TextBoxViewMargin="1 0 1 0"
208+
materialDesign:HintAssist.FloatingScale="0.54"
209+
materialDesign:HintAssist.FloatingOffset="1,-54"
210+
Text="Some Text"
211+
Style="{StaticResource MaterialDesignFloatingHintTextBox}"
212+
FontSize="24"/>
213+
214214
<TextBlock Grid.Row="7" Grid.Column="1" Style="{StaticResource MaterialDesignSubheadingTextBlock}"
215215
Margin="0 48 0 0">DataTemplate Test</TextBlock>
216216
<ContentControl Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="4"

MaterialDesignThemes.Wpf/Converters/DoubleRangeMultiConverter.cs

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Globalization;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
using System.Windows.Data;
8+
9+
namespace MaterialDesignThemes.Wpf.Converters
10+
{
11+
public class RangePositionConverterConverter : IMultiValueConverter
12+
{
13+
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
14+
{
15+
if(values == null || values.Length != 3 || values[0] == null || values[1] == null || values[2] == null)
16+
return Binding.DoNothing;
17+
18+
double positionAsScaleFactor, lower, upper;
19+
if (!double.TryParse(values[0].ToString(), out positionAsScaleFactor)
20+
|| !double.TryParse(values[1].ToString(), out lower)
21+
|| !double.TryParse(values[2].ToString(), out upper))
22+
23+
return Binding.DoNothing;
24+
25+
var result = upper + (lower - upper)*positionAsScaleFactor;
26+
27+
System.Diagnostics.Debug.WriteLine($"percantage={positionAsScaleFactor}, from={upper}, to={lower}, result={result}");
28+
29+
return result;
30+
}
31+
32+
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
33+
{
34+
throw new NotImplementedException();
35+
}
36+
}
37+
}

MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
<Compile Include="Converters\CircularProgressBar\StartPointConverter.cs" />
255255
<Compile Include="Converters\ClockItemIsCheckedConverter.cs" />
256256
<Compile Include="Converters\ClockLineConverter.cs" />
257-
<Compile Include="Converters\DoubleRangeMultiConverter.cs" />
257+
<Compile Include="Converters\RangePositionConverterConverter.cs" />
258258
<Compile Include="Converters\DrawerOffsetConverter.cs" />
259259
<Compile Include="Converters\EqualityToVisibilityConverter.cs" />
260260
<Compile Include="Converters\HintProxyFabricConverter.cs" />

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<converters:BooleanToVisibilityConverter x:Key="BoolToVisConverter"/>
88
<converters:BooleanToVisibilityConverter x:Key="InverseBoolToVisConverter" TrueValue="Collapsed" FalseValue="Visible"/>
9-
<converters:DoubleRangeMultiConverter x:Key="ScaleConverter"/>
9+
<converters:RangePositionConverterConverter x:Key="ScaleConverter"/>
1010
<converters:MathMultipleConverter x:Key="TranslateConverter" Operation="Multiply"/>
1111
<system:Double x:Key="NoContentFloatingScale">1.0</system:Double>
1212

@@ -110,15 +110,15 @@
110110
<ScaleTransform.ScaleX>
111111
<MultiBinding Converter="{StaticResource ScaleConverter}">
112112
<Binding Path="Tag" ElementName="FloatingHintTextBlock"/>
113-
<Binding Source="{StaticResource NoContentFloatingScale}"/>
114113
<Binding Path="FloatingScale" RelativeSource="{RelativeSource TemplatedParent}"/>
114+
<Binding Source="{StaticResource NoContentFloatingScale}"/>
115115
</MultiBinding>
116116
</ScaleTransform.ScaleX>
117117
<ScaleTransform.ScaleY>
118118
<MultiBinding Converter="{StaticResource ScaleConverter}">
119119
<Binding Path="Tag" ElementName="FloatingHintTextBlock"/>
120-
<Binding Source="{StaticResource NoContentFloatingScale}"/>
121120
<Binding Path="FloatingScale" RelativeSource="{RelativeSource TemplatedParent}"/>
121+
<Binding Source="{StaticResource NoContentFloatingScale}"/>
122122
</MultiBinding>
123123
</ScaleTransform.ScaleY>
124124
</ScaleTransform>

0 commit comments

Comments
 (0)