(MahAppsGH-3746) Fix some issues from Codacy/PR Quality Review

timunie · May 6, 2020 · 35814a0 · 35814a0
1 parent f1b17c6
commit 35814a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/MahApps.Metro/Controls/TimePicker/DateTimePicker.cs b/src/MahApps.Metro/Controls/TimePicker/DateTimePicker.cs
@@ -143,7 +143,7 @@ protected override void FocusElementAfterIsDropDownOpenChanged()
             // have been set even before the template for the DatePicker is
             // applied. And this would mean that the visuals wouldn't be available yet.
 
-            this.Dispatcher.BeginInvoke(DispatcherPriority.Input, (Action)delegate()
+            this.Dispatcher.BeginInvoke(DispatcherPriority.Input, (Action)delegate
                 {
                     // setting the focus to the calendar will focus the correct date.
                     this.calendar.Focus();
@@ -200,13 +200,11 @@ private void CalendarDisplayDateChanged(object sender, CalendarDateChangedEventA
 
         private void CalendarPreviewKeyDown(object sender, RoutedEventArgs e)
         {
-            var calendar = sender as Calendar;
             var keyEventArgs = (KeyEventArgs)e;
 
-            Debug.Assert(calendar != null);
             Debug.Assert(keyEventArgs != null);
 
-            if (keyEventArgs.Key == Key.Escape || ((keyEventArgs.Key == Key.Enter || keyEventArgs.Key == Key.Space) && calendar.DisplayMode == CalendarMode.Month))
+            if (keyEventArgs.Key == Key.Escape || ((keyEventArgs.Key == Key.Enter || keyEventArgs.Key == Key.Space) && this.calendar.DisplayMode == CalendarMode.Month))
             {
                 this.SetCurrentValue(IsDropDownOpenProperty, false);
                 if (keyEventArgs.Key == Key.Escape)

diff --git a/src/MahApps.Metro/Controls/TimePicker/TimePicker.cs b/src/MahApps.Metro/Controls/TimePicker/TimePicker.cs
@@ -32,7 +32,7 @@ protected override void FocusElementAfterIsDropDownOpenChanged()
             // have been set even before the template for the DatePicker is
             // applied. And this would mean that the visuals wouldn't be available yet.
 
-            this.Dispatcher.BeginInvoke(DispatcherPriority.Input, (Action)delegate()
+            this.Dispatcher.BeginInvoke(DispatcherPriority.Input, (Action)delegate
                 {
                     // setting the focus to the calendar will focus the correct date.
                     this.hourInput.Focus();

diff --git a/src/MahApps.Metro/Controls/TimePicker/TimePickerBase.cs b/src/MahApps.Metro/Controls/TimePicker/TimePickerBase.cs
@@ -47,10 +47,10 @@ public abstract class TimePickerBase : Control
         private bool deactivateTextChangedEvent;
         private bool textInputChanged;
         private UIElement hourHand;
-        public Selector hourInput;
+        protected Selector hourInput;
         private UIElement minuteHand;
         private Selector minuteInput;
-        protected Popup popUp;
+        private Popup popUp;
         private bool disablePopupReopen;
         private UIElement secondHand;
         private Selector secondInput;