[Fix] Issue when the time is cleared if a date is selected

MahApps · Feb 3, 2017 · 81d2d20 · 81d2d20
1 parent 324adee
commit 81d2d20
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/MahApps.Metro/MahApps.Metro.Shared/Controls/TimePicker/DateTimePicker.cs b/src/MahApps.Metro/MahApps.Metro.Shared/Controls/TimePicker/DateTimePicker.cs
@@ -156,7 +156,7 @@ protected override void ApplyBindings()
                 _calendar.SetBinding(Calendar.FirstDayOfWeekProperty, GetBinding(FirstDayOfWeekProperty));
                 _calendar.SetBinding(Calendar.IsTodayHighlightedProperty, GetBinding(IsTodayHighlightedProperty));
                 _calendar.SetBinding(FlowDirectionProperty, GetBinding(FlowDirectionProperty));
-                _calendar.SetBinding(Calendar.SelectedDateProperty, GetBinding(SelectedDateProperty));
+                _calendar.SelectedDatesChanged += OnCalendarSelectedDateChanged;
             }
         }
 
@@ -210,6 +210,19 @@ protected override void WriteValueToTextBox()
             }
         }
 
+        private void OnCalendarSelectedDateChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (e.AddedItems.Count > 0)
+            {
+                var dt = (DateTime)e.AddedItems[0];
+
+                var timeOfDay = SelectedDate.GetValueOrDefault().TimeOfDay;
+
+                dt += timeOfDay;
+                SelectedDate = dt;
+            }
+        }
+
         private static object CoerceOrientation(DependencyObject d, object basevalue)
         {
             if (((DateTimePicker)d).IsClockVisible)