Set size of DashedLine explicitly (#1772)

* Set size of DashedLine explicit to prevent infinite measuring (#1735)

* Added lost disabled controls again (#1749)

* Binding Height of DashedLine to Self.StrokeThickness (#1735)

* Added BottomThicknessConverter, used for DashedLine to get StrokeThickness (#1735)

* Added missing BottomThicknessConverter for TimePicker (#1735)

Author: greuelpirat

MainDemo.Wpf/Fields.xaml

@@ -102,6 +102,12 @@
                          Style="{StaticResource MaterialDesignFloatingHintTextBox}"
                          FontSize="24" />
             </smtx:XamlDisplay>
+            <smtx:XamlDisplay Key="fields_13" Grid.Row="4" Grid.Column="3">
+                <TextBox materialDesign:HintAssist.Hint="I'm Disabled" IsEnabled="False" MinWidth="72" />
+            </smtx:XamlDisplay>
+            <smtx:XamlDisplay Key="fields_15" Grid.Row="5" Grid.Column="3">
+                <PasswordBox Password="01234" IsEnabled="False" MinWidth="72" />
+            </smtx:XamlDisplay>
 
             <TextBlock Grid.Row="0" Grid.Column="4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Margin="32 0 0 0">Multi-line</TextBlock>
             <smtx:XamlDisplay Key="fields_3" Grid.Row="1" Grid.RowSpan="2" Grid.Column="4" Margin="32 0 0 0">

MaterialDesignThemes.Wpf/Converters/BottomThicknessConverter.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace MaterialDesignThemes.Wpf.Converters
+{
+    public class BottomThicknessConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (!(value is Thickness thickness))
+                return Binding.DoNothing;
+
+            if (parameter == null)
+                return thickness.Bottom;
+
+            return thickness.Bottom * System.Convert.ToDouble(parameter, CultureInfo.InvariantCulture);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            => throw new NotImplementedException();
+    }
+}

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

@@ -12,6 +12,7 @@
     <converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" IsNotEmptyValue="Collapsed" />
     <converters:MathConverter x:Key="MathAddConverter" Operation="Add" />
     <converters:MathConverter x:Key="DivisionMathConverter" Operation="Divide" />
+    <converters:BottomThicknessConverter x:Key="BottomThicknessConverter" />
     <converters:BrushRoundConverter x:Key="BrushRoundConverter" />
     <converters:BooleanToVisibilityConverter x:Key="InverseBoolToVisConverter" TrueValue="Collapsed" FalseValue="Visible"/>
     <converters:TextFieldClearButtonVisibilityConverter x:Key="ClearTextConverter" />
@@ -486,10 +487,12 @@
                   Grid.ColumnSpan="2"
                   Grid.Column="0"
                   VerticalAlignment="Bottom"
+                  Height="{Binding RelativeSource={RelativeSource Self}, Path=StrokeThickness}"
+                  Width="{Binding ActualWidth, ElementName=toggleButton}"
                   Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Converter={StaticResource InverseBoolToVisConverter}}"
                   Data="M 0,0 L 1,0"
                   Stretch="Fill"
-                  StrokeThickness="{Binding BorderThickness.Bottom, ElementName=toggleButton, Converter={StaticResource DivisionMathConverter}, ConverterParameter=0.75}"
+                  StrokeThickness="{Binding BorderThickness, ElementName=toggleButton, Converter={StaticResource BottomThicknessConverter}, ConverterParameter=1.33}"
                   StrokeDashArray="1,2.5"
                   StrokeDashCap="Round"
                   Stroke="{TemplateBinding BorderBrush}"
@@ -796,10 +799,12 @@
                       Grid.ColumnSpan="2"
                       Grid.Column="0"
                       VerticalAlignment="Bottom"
+                      Height="{Binding RelativeSource={RelativeSource Self}, Path=StrokeThickness}"
+                      Width="{Binding ActualWidth, ElementName=toggleButton}"
                       Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Converter={StaticResource InverseBoolToVisConverter}}"
                       Data="M 0,0 L 1,0"
                       Stretch="Fill"
-                      StrokeThickness="{Binding BorderThickness.Bottom, ElementName=toggleButton, Converter={StaticResource DivisionMathConverter}, ConverterParameter=0.75}"
+                      StrokeThickness="{Binding BorderThickness, ElementName=toggleButton, Converter={StaticResource BottomThicknessConverter}, ConverterParameter=1.33}"
                       StrokeDashArray="1,2.5"
                       StrokeDashCap="Round"
                       Stroke="{TemplateBinding BorderBrush}"

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml

@@ -10,6 +10,7 @@
 
     <converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" />
     <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+    <converters:BottomThicknessConverter x:Key="BottomThicknessConverter" />
     <converters:MathConverter Operation="Divide" x:Key="DivisionMathConverter" />
 
     <Style x:Key="MaterialDesignDatePickerTextBox" TargetType="{x:Type DatePickerTextBox}">
@@ -148,10 +149,12 @@
                                         SnapsToDevicePixels="True" />
                                 <Path x:Name="DashedLine"
                                       VerticalAlignment="Bottom"
+                                      Height="{Binding RelativeSource={RelativeSource Self}, Path=StrokeThickness}"
+                                      Width="{Binding ActualWidth, ElementName=border}"
                                       Visibility="Collapsed"
                                       Stretch="Fill"
                                       Data="M 0,0 L 1,0"
-                                      StrokeThickness="{Binding BorderThickness.Bottom, ElementName=border, Converter={StaticResource DivisionMathConverter}, ConverterParameter=0.75}"
+                                      StrokeThickness="{Binding BorderThickness, ElementName=border, Converter={StaticResource BottomThicknessConverter}, ConverterParameter=1.33}"
                                       StrokeDashArray="1,2.5"
                                       StrokeDashCap="Round"
                                       Stroke="{TemplateBinding BorderBrush}"

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml

@@ -9,6 +9,7 @@
 
     <converters:BooleanToVisibilityConverter x:Key="InverseBoolToVisConverter" TrueValue="Collapsed" FalseValue="Visible"/>
     <converters:MathConverter Operation="Divide" x:Key="DivisionMathConverter" />
+    <converters:BottomThicknessConverter x:Key="BottomThicknessConverter" />
     <converters:TextFieldClearButtonVisibilityConverter x:Key="ClearTextConverter" />
     <converters:NotConverter x:Key="NotConverter" />
     <converters:FontSizeToHintOffsetConverter x:Key="FontSizeToHintOffsetConverter" />
@@ -154,10 +155,12 @@
                                         SnapsToDevicePixels="True" />
                                 <Path x:Name="DashedLine"
                                       VerticalAlignment="Bottom"
+                                      Height="{Binding RelativeSource={RelativeSource Self}, Path=StrokeThickness}"
+                                      Width="{Binding ActualWidth, ElementName=border}"
                                       Visibility="Collapsed"
                                       Stretch="Fill"
                                       Data="M 0,0 L 1,0"
-                                      StrokeThickness="{Binding BorderThickness.Bottom, ElementName=border, Converter={StaticResource DivisionMathConverter}, ConverterParameter=0.75}"
+                                      StrokeThickness="{Binding BorderThickness, ElementName=border, Converter={StaticResource BottomThicknessConverter}, ConverterParameter=1.33}"
                                       StrokeDashArray="1,2.5"
                                       StrokeDashCap="Round"
                                       Stroke="{TemplateBinding BorderBrush}"

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

@@ -9,6 +9,7 @@
 
     <converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" />
     <converters:MathConverter Operation="Divide" x:Key="DivisionMathConverter" />
+    <converters:BottomThicknessConverter x:Key="BottomThicknessConverter" />
     <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     <converters:TextFieldClearButtonVisibilityConverter x:Key="ClearTextConverter" />
     <converters:NotConverter x:Key="NotConverter" />
@@ -162,9 +163,11 @@
                                 <Path x:Name="DashedLine"
                                       VerticalAlignment="Bottom"
                                       Visibility="Collapsed"
+                                      Height="{Binding RelativeSource={RelativeSource Self}, Path=StrokeThickness}"
+                                      Width="{Binding ActualWidth, ElementName=border}"
                                       Stretch="Fill"
                                       Data="M 0,0 L 1,0"
-                                      StrokeThickness="{Binding BorderThickness.Bottom, ElementName=border, Converter={StaticResource DivisionMathConverter}, ConverterParameter=0.75}"
+                                      StrokeThickness="{Binding BorderThickness, ElementName=border, Converter={StaticResource BottomThicknessConverter}, ConverterParameter=1.33}"
                                       StrokeDashArray="1,2.5"
                                       StrokeDashCap="Round"
                                       Stroke="{TemplateBinding BorderBrush}"

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml

@@ -7,6 +7,7 @@
     </ResourceDictionary.MergedDictionaries>
     <converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" />
     <converters:MathConverter Operation="Divide" x:Key="DivisionMathConverter" />
+    <converters:BottomThicknessConverter x:Key="BottomThicknessConverter" />
 
     <Style x:Key="MaterialDesignTimePicker" TargetType="{x:Type wpf:TimePicker}">
         <Setter Property="VerticalAlignment" Value="Center"/>
@@ -123,10 +124,12 @@
                         </Border>
                         <Path x:Name="DashedLine"
                               VerticalAlignment="Bottom"
+                              Height="{Binding RelativeSource={RelativeSource Self}, Path=StrokeThickness}"
+                              Width="{Binding ActualWidth, ElementName=border}"
                               Visibility="Collapsed"
                               Stretch="Fill"
                               Data="M 0,0 L 1,0"
-                              StrokeThickness="{Binding BorderThickness.Bottom, ElementName=border, Converter={StaticResource DivisionMathConverter}, ConverterParameter=0.75}"
+                              StrokeThickness="{Binding BorderThickness, ElementName=border, Converter={StaticResource BottomThicknessConverter}, ConverterParameter=1.33}"
                               StrokeDashArray="1,2.5"
                               StrokeDashCap="Round"
                               Stroke="{TemplateBinding BorderBrush}"