[Fix] Focusing issue in DateTimePicker

Closes #2838
MahApps · Feb 3, 2017 · 01ae145 · 01ae145
1 parent 81d2d20
commit 01ae145
Show file tree

Hide file tree

Showing 2 changed files with 11 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
@@ -5,6 +5,7 @@
     using System.Windows;
     using System.Windows.Controls;
     using System.Windows.Controls.Primitives;
+    using System.Windows.Input;
 
     /// <summary>
     ///     Represents a control that allows the user to select a date and a time.
@@ -177,6 +178,15 @@ protected override string GetValueForTextBox()
             return valueForTextBox;
         }
 
+        protected override void OnPreviewMouseUp(MouseButtonEventArgs e)
+        {
+            base.OnPreviewMouseUp(e);
+            if (Mouse.Captured is CalendarItem)
+            {
+                Mouse.Capture(null);
+            }
+        }
+
         protected override void OnRangeBaseValueChanged(object sender, SelectionChangedEventArgs e)
         {
             base.OnRangeBaseValueChanged(sender, e);

diff --git a/src/MahApps.Metro/MahApps.Metro.Shared/Controls/TimePicker/TimePickerBase.cs b/src/MahApps.Metro/MahApps.Metro.Shared/Controls/TimePicker/TimePickerBase.cs
@@ -168,7 +168,7 @@ public abstract class TimePickerBase : Control
         private Selector _hourInput;
         private UIElement _minuteHand;
         private Selector _minuteInput;
-        private Popup _popup;
+        protected Popup _popup;
         private UIElement _secondHand;
         private Selector _secondInput;
         protected DatePickerTextBox _textBox;