(GH-3746) Fix binding to Calendar SelectedDateProperty which breaks t…

…ime selection and more...
MahApps · May 3, 2020 · c47d1b2 · c47d1b2
1 parent 0453652
commit c47d1b2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/src/MahApps.Metro/Controls/TimePicker/DateTimePicker.cs b/src/MahApps.Metro/Controls/TimePicker/DateTimePicker.cs
@@ -4,6 +4,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
 
@@ -170,7 +171,7 @@ public override void OnApplyTemplate()
                 _calendar.SelectedDatesChanged += this.CalendarSelectedDateChanged;
                 _calendar.PreviewMouseUp += CalendarPreviewMouseUp;
 
-                _calendar.SetBinding(Calendar.SelectedDateProperty, GetBinding(SelectedDateTimeProperty));
+                _calendar.SetBinding(Calendar.SelectedDateProperty, GetBinding(SelectedDateTimeProperty, BindingMode.OneWay));
                 _calendar.SetBinding(Calendar.DisplayDateProperty, GetBinding(DisplayDateProperty));
                 _calendar.SetBinding(Calendar.DisplayDateStartProperty, GetBinding(DisplayDateStartProperty));
                 _calendar.SetBinding(Calendar.DisplayDateEndProperty, GetBinding(DisplayDateEndProperty));
@@ -366,6 +367,13 @@ protected override void ClockSelectedTimeChanged(object sender, SelectionChanged
             //SetDatePartValues();
         }
 
+        protected override void OnSelectedDateTimeChanged(DateTime? oldValue, DateTime? newValue)
+        {
+            this._calendar.SetCurrentValue(Calendar.SelectedDateProperty, newValue);
+
+            base.OnSelectedDateTimeChanged(oldValue, newValue);
+        }
+
         private DateTime? GetSelectedDateTimeFromGUI()
         {
             // Because Calendar.SelectedDate is bound to this.SelectedDate return this.SelectedDate

diff --git a/src/MahApps.Metro/Controls/TimePicker/TimePickerBase.cs b/src/MahApps.Metro/Controls/TimePicker/TimePickerBase.cs
@@ -485,6 +485,7 @@ public override void OnApplyTemplate()
         protected virtual void ApplyCulture()
         {
             _deactivateRangeBaseEvent = true;
+
             if (_ampmSwitcher != null)
             {
                 _ampmSwitcher.Items.Clear();
@@ -509,14 +510,15 @@ protected virtual void ApplyCulture()
             }
 
             SetDefaultTimeOfDayValues();
+
             _deactivateRangeBaseEvent = false;
 
             WriteValueToTextBox();
         }
 
-        protected Binding GetBinding(DependencyProperty property)
+        protected Binding GetBinding(DependencyProperty property, BindingMode bindingMode = BindingMode.Default)
         {
-            return new Binding(property.Name) { Source = this };
+            return new Binding(property.Name) { Source = this, Mode = bindingMode };
         }
 
         protected virtual string GetValueForTextBox()
@@ -741,10 +743,12 @@ private void TimePickerPreviewKeyDown(object sender, RoutedEventArgs e)
 
         private void TimePickerSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (!_deactivateRangeBaseEvent)
+            if (_deactivateRangeBaseEvent)
             {
-                this.ClockSelectedTimeChanged(sender, e);
+                return;
             }
+
+            this.ClockSelectedTimeChanged(sender, e);
         }
 
         private static void OnCultureChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -816,18 +820,16 @@ private static void OnSelectedDateTimeChanged(DependencyObject d, DependencyProp
                 return;
             }
 
-            // if just the DatePart changed, we should set the old TimePart for the NewValue
-            if (!timePartPickerBase._deactivateAdjustTimeOnDateChange && e.OldValue is DateTime oldVal && e.NewValue is DateTime newVal && oldVal.Date != newVal.Date && newVal.TimeOfDay.Ticks == 0 && oldVal.TimeOfDay.Ticks != 0)
-            {
-                timePartPickerBase.SetCurrentValue(SelectedDateTimeProperty, ((DateTime?)e.NewValue)?.Date + ((DateTime?)e.OldValue)?.TimeOfDay);
-                return;
-            }
+            timePartPickerBase.OnSelectedDateTimeChanged(e.OldValue as DateTime?, e.NewValue as DateTime?);
 
-            timePartPickerBase.SetHourPartValues((e.NewValue as DateTime?).GetValueOrDefault().TimeOfDay);
+            timePartPickerBase.WriteValueToTextBox();
 
             timePartPickerBase.RaiseSelectedDateTimeChangedEvent(e.OldValue as DateTime?, e.NewValue as DateTime?);
+        }
 
-            timePartPickerBase.WriteValueToTextBox();
+        protected virtual void OnSelectedDateTimeChanged(DateTime? oldValue, DateTime? newValue)
+        {
+            this.SetHourPartValues(newValue.GetValueOrDefault().TimeOfDay);
         }
 
         private static void SetVisibility(UIElement partHours, UIElement partMinutes, UIElement partSeconds, TimePartVisibility visibility)