(MahAppsGH-3746) Set selected time from textbox

timunie · May 6, 2020 · 3e47365 · 3e47365
1 parent 966f01b
commit 3e47365
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 51 deletions.
diff --git a/src/MahApps.Metro/Controls/TimePicker/DateTimePicker.cs b/src/MahApps.Metro/Controls/TimePicker/DateTimePicker.cs
@@ -178,8 +178,6 @@ public override void OnApplyTemplate()
                 _calendar.SetBinding(Calendar.IsTodayHighlightedProperty, GetBinding(IsTodayHighlightedProperty));
                 _calendar.SetBinding(FlowDirectionProperty, GetBinding(FlowDirectionProperty));
             }
-
-            //SetDatePartValues();
         }
 
         private static void CalendarPreviewMouseUp(object sender, MouseButtonEventArgs e)
@@ -241,7 +239,7 @@ private static void OnSelectedDateFormatChanged(DependencyObject d, DependencyPr
             }
         }
 
-        protected sealed override void ApplyCulture()
+        protected override void ApplyCulture()
         {
             base.ApplyCulture();
 
@@ -261,18 +259,18 @@ protected override string GetValueForTextBox()
             return valueForTextBox;
         }
 
-        protected override void OnTextBoxLostFocus(object sender, RoutedEventArgs e)
+        protected override void SetSelectedDateTime()
         {
-            if (!(sender is DatePickerTextBox textBox))
+            if (this._textBox is null)
             {
                 return;
             }
 
-            if (DateTime.TryParse(textBox.Text, SpecificCultureInfo, System.Globalization.DateTimeStyles.None, out var dateTime))
+
+            if (DateTime.TryParse(_textBox.Text, SpecificCultureInfo, System.Globalization.DateTimeStyles.None, out var dateTime))
             {
-                this._deactivateAdjustTimeOnDateChange = true;
                 this.SetCurrentValue(SelectedDateTimeProperty, dateTime);
-                this._deactivateAdjustTimeOnDateChange = false;
+                this.SetCurrentValue(DisplayDateProperty, dateTime);
             }
             else
             {
@@ -324,14 +322,6 @@ private void CalendarSelectedDateChanged(object sender, SelectionChangedEventArg
             }
         }
 
-        protected override void ClockSelectedTimeChanged(object sender, SelectionChangedEventArgs e)
-        {
-            var time = this.GetSelectedTimeFromGUI() ?? TimeSpan.Zero;
-            var date = SelectedDateTime ?? DateTime.Today;
-
-            this.SetCurrentValue(SelectedDateTimeProperty, date.Date + time);
-        }
-
         protected override void OnSelectedDateTimeChanged(DateTime? oldValue, DateTime? newValue)
         {
             this._calendar.SetCurrentValue(Calendar.SelectedDateProperty, newValue);
@@ -343,7 +333,6 @@ protected override void OnSelectedDateTimeChanged(DateTime? oldValue, DateTime?
         {
             // Because Calendar.SelectedDate is bound to this.SelectedDate return this.SelectedDate
             var selectedDate = SelectedDateTime;
-
             if (selectedDate != null)
             {
                 return selectedDate.Value.Date + GetSelectedTimeFromGUI().GetValueOrDefault();

diff --git a/src/MahApps.Metro/Controls/TimePicker/TimePicker.cs b/src/MahApps.Metro/Controls/TimePicker/TimePicker.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System.Windows.Threading;
 
 namespace MahApps.Metro.Controls
@@ -41,34 +39,23 @@ protected override void FocusElementAfterIsDropDownOpenChanged()
                 });
         }
 
-        protected override void ClockSelectedTimeChanged(object sender, SelectionChangedEventArgs e)
+        protected override void SetSelectedDateTime()
         {
-            var time = this.GetSelectedTimeFromGUI() ?? TimeSpan.Zero;
-            var date = SelectedDateTime ?? DateTime.Today;
-
-            this.SetCurrentValue(SelectedDateTimeProperty, date.Date + time);
-        }
-
-        protected override void OnTextBoxLostFocus(object sender, RoutedEventArgs e)
-        {
-            if (!(sender is DatePickerTextBox textBox))
+            if (this._textBox is null)
             {
                 return;
             }
 
-            if (TimeSpan.TryParse(textBox.Text, SpecificCultureInfo, out var timeSpan))
+            if (TimeSpan.TryParse(_textBox.Text, SpecificCultureInfo, out var timeSpan))
             {
                 this.SetCurrentValue(SelectedDateTimeProperty, this.SelectedDateTime.GetValueOrDefault().Date + timeSpan);
             }
             else
             {
-                if (string.IsNullOrEmpty(textBox.Text))
-                {
-                    this.SetCurrentValue(SelectedDateTimeProperty, null);
-                    WriteValueToTextBox(string.Empty);
-                }
-                else
+                this.SetCurrentValue(SelectedDateTimeProperty, null);
+                if (SelectedDateTime == null)
                 {
+                    // if already null, overwrite wrong data in textbox
                     WriteValueToTextBox();
                 }
             }

diff --git a/src/MahApps.Metro/Controls/TimePicker/TimePickerBase.cs b/src/MahApps.Metro/Controls/TimePicker/TimePickerBase.cs
@@ -55,7 +55,6 @@ public abstract class TimePickerBase : Control
         private UIElement _secondHand;
         private Selector _secondInput;
         protected DatePickerTextBox _textBox;
-        protected bool _deactivateAdjustTimeOnDateChange;
         protected DateTime? _originalSelectedDateTime;
 
         public static readonly DependencyProperty SourceHoursProperty = DependencyProperty.Register(
@@ -528,9 +527,13 @@ protected virtual string GetValueForTextBox()
             return valueForTextBox;
         }
 
-        protected abstract void OnTextBoxLostFocus(object sender, RoutedEventArgs e);
+        protected virtual void ClockSelectedTimeChanged()
+        {
+            var time = this.GetSelectedTimeFromGUI() ?? TimeSpan.Zero;
+            var date = SelectedDateTime ?? DateTime.Today;
 
-        protected abstract void ClockSelectedTimeChanged(object sender, SelectionChangedEventArgs e);
+            this.SetCurrentValue(SelectedDateTimeProperty, date.Date + time);
+        }
 
         protected void RaiseSelectedDateTimeChangedEvent(DateTime? oldValue, DateTime? newValue)
         {
@@ -670,21 +673,16 @@ protected virtual void OnPopUpClosed()
             // nothing here
         }
 
-        protected void WriteValueToTextBox(string value)
+        protected virtual void WriteValueToTextBox()
         {
             if (_textBox != null)
             {
                 _deactivateTextChangedEvent = true;
-                _textBox.Text = value;
+                _textBox.Text = GetValueForTextBox();
                 _deactivateTextChangedEvent = false;
             }
         }
 
-        protected virtual void WriteValueToTextBox()
-        {
-            WriteValueToTextBox(GetValueForTextBox());
-        }
-
         private static IList<int> CreateValueList(int interval)
         {
             return Enumerable.Repeat(interval, 60 / interval)
@@ -748,7 +746,7 @@ private void TimePickerSelectionChanged(object sender, SelectionChangedEventArgs
                 return;
             }
 
-            this.ClockSelectedTimeChanged(sender, e);
+            this.ClockSelectedTimeChanged();
         }
 
         private static void OnCultureChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -882,7 +880,7 @@ private static void SetDefaultTimeOfDayValue(Selector selector)
                     return new TimeSpan(hours, minutes, seconds);
                 }
 
-                return null; //this.SelectedDateTime.GetValueOrDefault().TimeOfDay;
+                return null;
             }
         }
 
@@ -956,7 +954,7 @@ private void TogglePopUp()
                 }
                 else
                 {
-                    // SetSelectedDate();
+                    SetSelectedDateTime();
                     this.SetCurrentValue(IsDropDownOpenProperty, true);
                 }
             }
@@ -1072,21 +1070,23 @@ private bool ProcessKey(KeyEventArgs e)
 
                 case Key.Enter:
                 {
-                    // SetSelectedDate();
+                    SetSelectedDateTime();
                     return true;
                 }
             }
 
             return false;
         }
 
+        protected abstract void SetSelectedDateTime();
+
         private void TextBox_LostFocus(object sender, RoutedEventArgs e)
         {
             if (_textInputChanged)
             {
                 _textInputChanged = false;
 
-                OnTextBoxLostFocus(sender, e);
+                SetSelectedDateTime();
             }
         }