Ensure selected time always displays initial value. Alternative fix to PR #418

Author: ButchersBoy

MainDemo.Wpf/ProvingGround.xaml

@@ -60,6 +60,8 @@
         </ListBox>
 
         <CheckBox IsChecked="{Binding ElementName=UnderlineCheckbox, Path=IsSelected}">Underline?</CheckBox>
+        
+        <materialDesign:TimePicker Margin="0 16 0 0" SelectedTime="{Binding SelectedTime}" HorizontalAlignment="Left" />
 
     </StackPanel>
 

MainDemo.Wpf/ProvingGround.xaml.cs

@@ -28,7 +28,10 @@ public partial class ProvingGround : UserControl
         public ProvingGround()
         {
             InitializeComponent();
-	        DataContext = new ProvingGroundViewModel();
+            DataContext = new ProvingGroundViewModel
+            {
+                SelectedTime = new DateTime(2000, 1, 1, 3, 15, 0)
+            };
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

@@ -191,7 +191,6 @@
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-        <Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="1 0 0 0" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
@@ -561,6 +560,7 @@
         <Setter Property="ScrollViewer.PanningMode" Value="Both" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
         <Setter Property="Validation.ErrorTemplate" Value="{StaticResource MaterialDesignValidationErrorTemplate}"/>
+        <Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="1 0 0 0" />
         <Setter Property="Template" Value="{StaticResource MaterialDesignFloatingHintComboBoxTemplate}" />
         <Style.Triggers>
             <Trigger Property="IsKeyboardFocused" Value="true">

MaterialDesignThemes.Wpf/TimePicker.cs

@@ -26,6 +26,7 @@ public class TimePicker : Control
 		private Button _dropDownButton;
 		private bool _disablePopupReopen;
         private DateTime? _lastValidTime;
+	    private bool _isManuallyMutatingText;
 
         static TimePicker()
 		{
@@ -51,7 +52,8 @@ public TimePicker()
 		private static void TextPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
 		{
 			var timePicker = (TimePicker) dependencyObject;
-			timePicker.SetSelectedTime();
+            if (!timePicker._isManuallyMutatingText)
+			    timePicker.SetSelectedTime();
 			if (timePicker._textBox != null)
 				timePicker._textBox.Text = dependencyPropertyChangedEventArgs.NewValue as string;
 		}
@@ -68,7 +70,9 @@ public string Text
 		private static void SelectedTimePropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
 		{
 			var timePicker = (TimePicker) dependencyObject;
-			timePicker.SetCurrentValue(TextProperty, timePicker.DateTimeToString(timePicker.SelectedTime));		
+		    timePicker._isManuallyMutatingText = true;
+			timePicker.SetCurrentValue(TextProperty, timePicker.DateTimeToString(timePicker.SelectedTime));
+            timePicker._isManuallyMutatingText = false;
             timePicker._lastValidTime = timePicker.SelectedTime;
         }