hints on date pickers

Author: ButchersBoy

MaterialDesignColors.WpfExample/ProgressWindow.xaml

@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Title="Progress Indicators" Height="300" Width="600">
+        Title="Progress Indicators" Height="300" Width="600" Left="40" Top="40">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />

MaterialDesignColors.WpfExample/TextFields.xaml

@@ -115,7 +115,7 @@
         <TextBox Grid.Row="3" Grid.Column="1" wpf:TextField.Hint="Floating Hint" Style="{StaticResource MaterialDesignFloatingHintTextBox}" />
         <TextBox Grid.Row="3" Grid.Column="3" wpf:TextField.Hint="Floating Hint" Style="{StaticResource MaterialDesignFloatingHintTextBox}" Text="Good stuff" />
 		<DatePicker Grid.Row="4" Grid.Column="1" Width="100" HorizontalAlignment="Left" Margin="0 8 0 8"
-                    wpf:TextField.Hint="James"/>		
+                    wpf:TextField.Hint="Pick Date"/>		
 		<wpf:TimePicker Grid.Row="4" Grid.Column="3" VerticalAlignment="Top"  Width="90" HorizontalAlignment="Left" Margin="0 8 0 8" />
         <wpf:TimePicker Grid.Row="4" Grid.Column="4" x:Name="PresetTimePicker" VerticalAlignment="Top"  Width="90" HorizontalAlignment="Left" Margin="0 8 0 8"
                         wpf:TextField.Hint="Custom hint" />

MaterialDesignThemes.Wpf/TextField.cs

@@ -40,10 +40,12 @@ public static class TextField
             typeof(TextField),
             new PropertyMetadata(.23, HintOpacityPropertyChangedCallback));
 
+        /// <summary>
+        /// Internal framework use only.
+        /// </summary>
         public static readonly DependencyProperty TextProperty = DependencyProperty.RegisterAttached(
             "Text", typeof (string), typeof (TextField), new PropertyMetadata(default(string), TextPropertyChangedCallback));
 
-
         private static readonly DependencyPropertyKey IsNullOrEmptyPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
             "IsNullOrEmpty", typeof(bool), typeof(TextField), new PropertyMetadata(true));
 

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml

@@ -1,12 +1,15 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
+                    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"
+                    xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters">
 
 	<ResourceDictionary.MergedDictionaries>
 		<ResourceDictionary Source="MaterialDesignTheme.Calendar.xaml" />
 	</ResourceDictionary.MergedDictionaries>
 
-	<Style x:Key="MaterialDesignDatePickerTextBox" TargetType="{x:Type DatePickerTextBox}">
+    <converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" />
+
+    <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:TextField.TextBoxViewMargin" Value="1 0 0 0" />
 		<Setter Property="Background" Value="Transparent"/>
@@ -49,7 +52,12 @@
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 						<Grid x:Name="WatermarkContent" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-							<ContentControl x:Name="PART_Watermark" Focusable="False" IsHitTestVisible="False" Opacity="0" />
+                            <TextBlock Text="{Binding Path=(wpf:TextField.Hint), RelativeSource={RelativeSource TemplatedParent}}"
+                                       Visibility="{TemplateBinding Text, Converter={StaticResource TextFieldHintVisibilityConverter}}"
+                                       x:Name="Hint"
+                                       Margin="1 0 1 0"
+                                       Opacity="{Binding Path=(wpf:TextField.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}"/>
+							<ContentControl x:Name="PART_Watermark" Focusable="False" IsHitTestVisible="False" Opacity="0" Visibility="Collapsed" />
 							<ScrollViewer x:Name="PART_ContentHost" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
 						</Grid>
 					</Grid>