From b402a09fd8a8ddf50ed2e14411ed9eaca90ab939 Mon Sep 17 00:00:00 2001
From: farkhutdinova <farkhutdinova@protei.ru>
Date: Mon, 1 Oct 2018 11:31:06 +0300
Subject: [PATCH] Update timePicker value on calendar selection changed

---
 .../DateTimePicker/Implementation/DateTimePicker.cs    |  5 +++++
 .../Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs     |  2 +-
 .../TimePicker/Implementation/TimePicker.cs            | 10 +++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

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<T> ), 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 )