Merge pull request #496 from telerik/development

Merge development into master
telerik · May 13, 2021 · e834546 · e834546
2 parents c82af79 + 3bd2cd5
commit e834546
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/BuildTools/BuildNuGet.bat b/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.4
+%MSBUILD% BuildNuget.UWP.proj /property:Version=1.0.2.5
diff --git a/BuildTools/BuildNuget.UWP.proj b/BuildTools/BuildNuget.UWP.proj
@@ -15,7 +15,7 @@
     <Target Name="PrepareNugetProperties">
 
         <PropertyGroup>
-            <Version Condition= " '$(Version)' == '' ">1.0.2.4</Version>
+            <Version Condition= " '$(Version)' == '' ">1.0.2.5</Version>
             <FullPathDeployDirectory>$([System.IO.Path]::GetFullPath('$(DeployDirectory)'))</FullPathDeployDirectory>
             <BinariesSubDir>$(BinariesTargetDirectory)</BinariesSubDir>
 

diff --git a/BuildTools/Nuspecs.UWP/Package.UniversalWindowsPlatform.nuspec b/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.4</releaseNotes>
+		<releaseNotes>For full release notes see https://github.com/telerik/UI-For-UWP/releases/tag/1.0.2.5</releaseNotes>
 		<tags>UWP Windows Telerik Controls XAML C#</tags>
         <language>en-US</language>
     </metadata>

diff --git a/Controls/Primitives/Primitives.UWP/Shadow/RadShadow.cs b/Controls/Primitives/Primitives.UWP/Shadow/RadShadow.cs
@@ -56,10 +56,10 @@ public class RadShadow : RadControl
             DependencyProperty.Register(nameof(Content), typeof(object), typeof(RadShadow), new PropertyMetadata(null, new PropertyChangedCallback((d, e) => ((RadShadow)d).Invalidate())));
 
         /// <summary>
-        /// Identifies the <see cref="CornerRadius"/> dependency property.
+        /// Identifies the <see cref="ShadowCornerRadius"/> dependency property.
         /// </summary>
-        public static readonly DependencyProperty CornerRadiusProperty =
-            DependencyProperty.Register(nameof(CornerRadius), typeof(double), typeof(RadShadow), new PropertyMetadata(0.0d, new PropertyChangedCallback((d, e) => ((RadShadow)d).OnCornerRadiusPropertyChanged())));
+        public static readonly DependencyProperty ShadowCornerRadiusProperty =
+            DependencyProperty.Register(nameof(ShadowCornerRadius), typeof(double), typeof(RadShadow), new PropertyMetadata(0.0d, new PropertyChangedCallback((d, e) => ((RadShadow)d).OnShadowCornerRadiusPropertyChanged())));
 
         private const string PartShadowName = "PART_Shadow";
 
@@ -134,10 +134,10 @@ public object Content
         /// <summary>
         /// Gets or sets the corner radius of the shadow.
         /// </summary>
-        public double CornerRadius
+        public double ShadowCornerRadius
         {
-            get { return (double)this.GetValue(CornerRadiusProperty); }
-            set { this.SetValue(CornerRadiusProperty, value); }
+            get { return (double)this.GetValue(ShadowCornerRadiusProperty); }
+            set { this.SetValue(ShadowCornerRadiusProperty, value); }
         }
 
         /// <summary>
@@ -228,7 +228,7 @@ private void InitializeDropShadow()
             this.OnOffsetPropertyChanged();
             this.OnBlurRadiusPropertyChanged();
             this.OnShadowOpacityPropertyChanged();
-            this.OnCornerRadiusPropertyChanged();
+            this.OnShadowCornerRadiusPropertyChanged();
 
             this.shadowVisual.Shadow = this.dropShadow;
 
@@ -296,17 +296,17 @@ private void OnShadowOpacityPropertyChanged()
             }
         }
 
-        private void OnCornerRadiusPropertyChanged()
+        private void OnShadowCornerRadiusPropertyChanged()
         {
             if (this.shadowView == null)
             {
                 return;
             }
 
-            var cornerRadius = this.CornerRadius;
+            var cornerRadius = this.ShadowCornerRadius;
             if (cornerRadius < 0)
             {
-                throw new ArgumentException($"{cornerRadius} is an invalid value for {nameof(this.CornerRadius)}");
+                throw new ArgumentException($"{cornerRadius} is an invalid value for {nameof(this.ShadowCornerRadius)}");
             }
 
             if (cornerRadius > 0)

diff --git a/SDKExamples.UWP/Examples/Shadow/Configurations.xaml b/SDKExamples.UWP/Examples/Shadow/Configurations.xaml
@@ -102,7 +102,7 @@
                                   ShadowOpacity="{Binding Opacity}"
                                   OffsetX="{Binding OffsetX}"
                                   OffsetY="{Binding OffsetY}"
-                                  CornerRadius="{Binding CornerRadius}"
+                                  ShadowCornerRadius="{Binding CornerRadius}"
                                   BlurRadius="{Binding Blur}"/>
         </Grid>
     </Grid>