Merge pull request #477 from telerik/development

Merge development into master

Author: petar-k-marchev

BuildTools/BuildNuGet.bat

@@ -1,2 +1,2 @@
 SET MSBUILD=%WINDIR%\microsoft.net\framework\v4.0.30319\MSBuild.exe
-%MSBUILD% BuildNuget.UWP.proj /property:Version=1.0.2.1
+%MSBUILD% BuildNuget.UWP.proj /property:Version=1.0.2.2

BuildTools/BuildNuget.UWP.proj

@@ -15,7 +15,7 @@
     <Target Name="PrepareNugetProperties">
 
         <PropertyGroup>
-            <Version Condition= " '$(Version)' == '' ">1.0.2.1</Version>
+            <Version Condition= " '$(Version)' == '' ">1.0.2.2</Version>
             <FullPathDeployDirectory>$([System.IO.Path]::GetFullPath('$(DeployDirectory)'))</FullPathDeployDirectory>
             <BinariesSubDir>$(BinariesTargetDirectory)</BinariesSubDir>
 

BuildTools/Nuspecs.UWP/Package.UniversalWindowsPlatform.nuspec

@@ -11,7 +11,7 @@
         <iconUrl>http://www.telerik.com/docs/default-source/nuget-feed-product-files/nugeticon_uwp.png?sfvrsn=2</iconUrl>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
         <description>UI for Universal Windows Platform is a toolset for building Universal Windows Platform apps for the Windows Store and the enterprise. The library is designed to offer the same user experience, functionality and behavior on Windows devices of all form factors.</description>
-		<releaseNotes>For full release notes see https://github.com/telerik/UI-For-UWP/releases/tag/1.0.2.1</releaseNotes>
+		<releaseNotes>For full release notes see https://github.com/telerik/UI-For-UWP/releases/tag/1.0.2.2</releaseNotes>
 		<tags>UWP Windows Telerik Controls XAML C#</tags>
         <language>en-US</language>
     </metadata>

Controls/Input/Input.UWP/Calendar/View/Layers/XamlMultiDayViewLayer.cs

@@ -666,6 +666,7 @@ internal void ArrangeVisualElement()
             }
 
             this.UpdatePanelsBackground(calendar.MultiDayViewSettings.TimelineBackground);
+            this.UpdateTopHeaderBackground();
         }
 
         internal void UpdatePanelsBackground(Brush background)
@@ -1224,5 +1225,19 @@ private void ApplyTimeRulerStyle(object item, FrameworkElement container)
                 }
             }
         }
+
+        private void UpdateTopHeaderBackground()
+        {
+            Brush defaultCalendarBrush = this.Owner.Background ?? MultiDayViewSettings.DefaultBackground;
+            if (this.topHeader.Background != defaultCalendarBrush)
+            {
+                this.topHeader.Background = defaultCalendarBrush;
+            }
+
+            if (this.topLeftHeaderPanel.Background != defaultCalendarBrush)
+            {
+                this.topLeftHeaderPanel.Background = defaultCalendarBrush;
+            }
+        }
     }
 }

Controls/Input/Input.UWP/Calendar/View/RadCalendar.cs

@@ -3315,8 +3315,13 @@ private async void CallUpdateUI()
 
             if (this.pendingScrollTimeRuler != null)
             {
-                await this.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () => this.pendingScrollTimeRuler.Invoke());
-                this.pendingScrollTimeRuler = null;
+                await this.Dispatcher.RunAsync(
+                    Windows.UI.Core.CoreDispatcherPriority.Normal, 
+                    () =>
+                {
+                    this.pendingScrollTimeRuler?.Invoke();
+                    this.pendingScrollTimeRuler = null;
+                });
             }
         }