(MahAppsGH-3746) Add DisplayDateChanged event handling

timunie · Apr 21, 2020 · d669fab · d669fab
1 parent 1b81b90
commit d669fab
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/MahApps.Metro/Controls/TimePicker/DateTimePicker.cs b/src/MahApps.Metro/Controls/TimePicker/DateTimePicker.cs
@@ -150,6 +150,7 @@ public override void OnApplyTemplate()
             if (_calendar != null)
             {
                 _calendar.PreviewKeyDown -= this.CalendarPreviewKeyDown;
+                _calendar.DisplayDateChanged -= this.CalendarDisplayDateChanged;
                 _calendar.SelectedDatesChanged -= CalendarSelectedDateChanged;
                 _calendar.PreviewMouseUp -= CalendarPreviewMouseUp;
             }
@@ -161,6 +162,7 @@ public override void OnApplyTemplate()
             if (_calendar != null)
             {
                 _calendar.PreviewKeyDown += this.CalendarPreviewKeyDown;
+                _calendar.DisplayDateChanged += this.CalendarDisplayDateChanged;
                 _calendar.SelectedDatesChanged += CalendarSelectedDateChanged;
                 _calendar.PreviewMouseUp += CalendarPreviewMouseUp;
 
@@ -184,6 +186,14 @@ private static void CalendarPreviewMouseUp(object sender, MouseButtonEventArgs e
             }
         }
 
+        private void CalendarDisplayDateChanged(object sender, CalendarDateChangedEventArgs e)
+        {
+            if (e.AddedDate is DateTime addedDate && addedDate != this.DisplayDate)
+            {
+                SetCurrentValue(DisplayDateProperty, addedDate);
+            }
+        }
+
         private void CalendarPreviewKeyDown(object sender, RoutedEventArgs e)
         {
             var calendar = sender as Calendar;