Date/TimePicker disabled style update, ammends #838 (#919)

* Date/TimePicker disabled style update, ammends #838

* fix conflicts

Author: JeffBarnard

MainDemo.Wpf/Pickers.xaml

@@ -41,7 +41,10 @@
                         </DatePicker.SelectedDate>
                     </DatePicker>
                 </smtx:XamlDisplay>
-                <smtx:XamlDisplay Key="pickers_3" HorizontalAlignment="Left" Margin="0 32 0 0">
+                    <smtx:XamlDisplay Key="pickers_2_disabled" HorizontalAlignment="Left" Margin="0 16 0 0" >
+                        <DatePicker IsEnabled="False" Width="100" materialDesign:HintAssist.Hint="Disabled" />
+                    </smtx:XamlDisplay>
+                    <smtx:XamlDisplay Key="pickers_3" HorizontalAlignment="Left" Margin="0 32 0 0">
                     <ComboBox Name="LocaleCombo" Width="50">
                         <ComboBox.ItemsPanel>
                             <ItemsPanelTemplate>
@@ -57,11 +60,19 @@
                     <DatePicker Name="LocaleDatePickerRTL" Width="120" materialDesign:HintAssist.Hint="RTL Locale Date" FlowDirection="RightToLeft" />
                 </smtx:XamlDisplay>
             </StackPanel>
-            <smtx:XamlDisplay Key="pickers_6" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" Margin="0 16 0 0" VerticalAlignment="Top">
-                <materialDesign:TimePicker Width="100" 
-                                           Style="{StaticResource MaterialDesignFloatingHintTimePicker}"
-                                           materialDesign:HintAssist.Hint="Custom hint" />
-            </smtx:XamlDisplay>
+            <StackPanel Grid.Row="1" Grid.Column="1" >
+                <smtx:XamlDisplay Key="pickers_6" HorizontalAlignment="Left" Margin="0 16 0 0" VerticalAlignment="Top">
+                    <materialDesign:TimePicker Width="100" 
+                                        Style="{StaticResource MaterialDesignFloatingHintTimePicker}"
+                                        materialDesign:HintAssist.Hint="Custom hint" />
+                </smtx:XamlDisplay>
+                <smtx:XamlDisplay Key="pickers_6_disabled" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Margin="0 16 0 0" VerticalAlignment="Top">
+                    <materialDesign:TimePicker Width="100" IsEnabled="False"
+                                        Style="{StaticResource MaterialDesignFloatingHintTimePicker}"
+                                        materialDesign:HintAssist.Hint="Disabled" />
+                </smtx:XamlDisplay>
+            </StackPanel>
+
             <smtx:XamlDisplay Key="pickers_7" Grid.Row="1" Grid.Column="2" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="0 16 0 0">
                 <materialDesign:TimePicker Is24Hours="True" x:Name="PresetTimePicker" Width="100" SelectedTimeChanged="PresetTimePicker_SelectedTimeChanged"/>
             </smtx:XamlDisplay>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml

@@ -9,7 +9,8 @@
     </ResourceDictionary.MergedDictionaries>
 
     <converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" />
-
+    <converters:MathConverter Operation="Divide" x:Key="DivisionMathConverter" />
+    
     <Style x:Key="MaterialDesignDatePickerTextBox" TargetType="{x:Type DatePickerTextBox}">
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
         <Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="0 0 0 0" />
@@ -185,11 +186,17 @@
                                        PopupAnimation="Fade"  />
                             </Grid>
                         </Border>
+                        <Line x:Name="DashedLine" VerticalAlignment="Bottom" Visibility="Hidden"
+                              StrokeThickness="{Binding BorderThickness.Bottom, ElementName=border, Converter={StaticResource DivisionMathConverter}, ConverterParameter=0.75}" StrokeDashArray="1,2.5" StrokeDashCap="Round"
+                              X1="0" X2="{Binding ActualWidth, ElementName=border}" Y1="0" Y2="0" 
+                              Stroke="{TemplateBinding BorderBrush}" Opacity="0.56" />
                         <wpf:Underline x:Name="Underline" Visibility="{Binding Path=(wpf:TextFieldAssist.DecorationVisibility), RelativeSource={RelativeSource TemplatedParent}}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="false">
                             <Setter Property="Opacity" TargetName="border" Value="0.56" />
+                            <Setter Property="Visibility" TargetName="DashedLine"  Value="Visible" />
+                            <Setter Property="BorderBrush" TargetName="border" Value="Transparent" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
                             <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}" />

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml

@@ -8,14 +8,15 @@
     </ResourceDictionary.MergedDictionaries>
 
     <converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" />
+    <converters:MathConverter Operation="Divide" x:Key="DivisionMathConverter" />
 
     <Style x:Key="MaterialDesignTimePicker" TargetType="{x:Type wpf:TimePicker}">
-        <Setter Property="VerticalAlignment" Value="Top"/>
-        <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextBoxBorder}" />
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="0 0 0 1"/>
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+		<Setter Property="VerticalAlignment" Value="Top"/>
+		<Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextBoxBorder}" />
+		<Setter Property="Background" Value="Transparent"/>
+		<Setter Property="BorderThickness" Value="0 0 0 1"/>
+		<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
         <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="Margin" Value="0 12 0 0" />
         <Setter Property="wpf:HintAssist.Hint" Value="Select time" />
@@ -118,11 +119,17 @@
                                        PopupAnimation="Fade"/>
                             </Grid>
                         </Border>
+                        <Line x:Name="DashedLine" VerticalAlignment="Bottom" Visibility="Hidden"
+                              StrokeThickness="{Binding BorderThickness.Bottom, ElementName=border, Converter={StaticResource DivisionMathConverter}, ConverterParameter=0.75}" StrokeDashArray="1,2.5" StrokeDashCap="Round"
+                              X1="0" X2="{Binding ActualWidth, ElementName=border}" Y1="0" Y2="0" 
+                              Stroke="{TemplateBinding BorderBrush}" Opacity="0.56" />
                         <wpf:Underline x:Name="Underline" Visibility="{Binding Path=(wpf:TextFieldAssist.DecorationVisibility), RelativeSource={RelativeSource TemplatedParent}}"/>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Opacity" TargetName="TemplateRoot" Value="0.56"/>
+                            <Setter Property="Visibility" TargetName="DashedLine"  Value="Visible" />
+                            <Setter Property="BorderBrush" TargetName="border" Value="Transparent"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
                             <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>