diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs index 169a40a1..e15eccd0 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs @@ -434,6 +434,11 @@ namespace Xceed.Wpf.Toolkit this.Value = newDate; } } + // Update _timePicker Value for correct time choise + if (newDate != null) + { + _timePicker.UpdateValueProperty(newDate.Value); + } } } diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs index ac2430fc..cb7a8775 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs @@ -407,7 +407,7 @@ UpDownBase ), new UIPropertyMetadata( true ) ); } } - private void SetValueInternal( T value ) + protected void SetValueInternal( T value ) { _internalValueSet = true; try diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs index 41532b30..bebe014c 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs @@ -392,10 +392,18 @@ namespace Xceed.Wpf.Toolkit this.ClosePopup( true ); } - #endregion //Event Handlers + #endregion //Event Handlers #region Methods + public void UpdateValueProperty(DateTime? newValueDateTime) + { + if (newValueDateTime != null) + { + this.SetValueInternal(newValueDateTime); + } + } + private void ValidateTime( TimeSpan time ) { if( time.TotalHours >= 24d )