(MahAppsGH-3746) Respect IsEnabledProperty

timunie · May 4, 2020 · 44d032b · 44d032b
1 parent 39f6cf8
commit 44d032b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/MahApps.Metro/Controls/TimePicker/DateTimePicker.cs b/src/MahApps.Metro/Controls/TimePicker/DateTimePicker.cs
@@ -47,7 +47,6 @@ static DateTimePicker()
 
         public DateTimePicker()
         {
-            this.SetCurrentValue(DisplayDateProperty, DateTime.Today);
         }
 
         /// <inheritdoc />

diff --git a/src/MahApps.Metro/Controls/TimePicker/TimePickerBase.cs b/src/MahApps.Metro/Controls/TimePicker/TimePickerBase.cs
@@ -115,6 +115,14 @@ private static void OnIsDropDownOpenChanged(DependencyObject d, DependencyProper
             }
         }
 
+        private static void OnIsEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is TimePickerBase tp)
+            {
+                tp.CoerceValue(IsDropDownOpenProperty);
+            }
+        }
+
         /// <summary>
         /// This method is invoked when the <see cref="IsDropDownOpenProperty"/> changes.
         /// </summary>
@@ -228,10 +236,11 @@ protected virtual void FocusElementAfterIsDropDownOpenChanged()
 
         static TimePickerBase()
         {
-            EventManager.RegisterClassHandler(typeof(TimePickerBase), UIElement.GotFocusEvent, new RoutedEventHandler(OnGotFocus));
             DefaultStyleKeyProperty.OverrideMetadata(typeof(TimePickerBase), new FrameworkPropertyMetadata(typeof(TimePickerBase)));
+            EventManager.RegisterClassHandler(typeof(TimePickerBase), UIElement.GotFocusEvent, new RoutedEventHandler(OnGotFocus));
             VerticalContentAlignmentProperty.OverrideMetadata(typeof(TimePickerBase), new FrameworkPropertyMetadata(VerticalAlignment.Center));
             LanguageProperty.OverrideMetadata(typeof(TimePickerBase), new FrameworkPropertyMetadata(OnLanguageChanged));
+            IsEnabledProperty.OverrideMetadata(typeof(DatePicker), new UIPropertyMetadata(new PropertyChangedCallback(OnIsEnabledChanged)));
         }
 
         protected TimePickerBase()