Merge pull request #3695 from unoplatform/dev/jela/canvas-autoconvert

fix(reg): missing auto-convert in Canvas properties
unoplatform · Aug 3, 2020 · bac4731 · bac4731
2 parents 25a507d + 26165c9
commit bac4731
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/Uno.UI.Tests/Windows_UI_XAML_Controls/CanvasTests/Given_Canvas.cs b/src/Uno.UI.Tests/Windows_UI_XAML_Controls/CanvasTests/Given_Canvas.cs
@@ -62,5 +62,26 @@ public void When_SimpleLayout()
 
 			Assert.AreEqual(2, CAV.GetChildren().Count());
 		}
+
+		[TestMethod]
+		public void When_CanvasPropertyConvert()
+		{
+			var SUT = new Canvas();
+
+			SUT.SetValue(Canvas.LeftProperty, "42");
+			Assert.AreEqual(42d, SUT.GetValue(Canvas.LeftProperty));
+
+			SUT.SetValue(Canvas.LeftProperty, 43);
+			Assert.AreEqual(43d, SUT.GetValue(Canvas.LeftProperty));
+
+			SUT.SetValue(Canvas.LeftProperty, 44f);
+			Assert.AreEqual(44d, SUT.GetValue(Canvas.LeftProperty));
+
+			SUT.SetValue(Canvas.TopProperty, "42");
+			Assert.AreEqual(42d, SUT.GetValue(Canvas.TopProperty));
+
+			SUT.SetValue(Canvas.ZIndexProperty, "42");
+			Assert.AreEqual(42d, SUT.GetValue(Canvas.ZIndexProperty));
+		}
 	}
 }
diff --git a/src/Uno.UI/UI/Xaml/Controls/Canvas/Canvas.cs b/src/Uno.UI/UI/Xaml/Controls/Canvas/Canvas.cs
@@ -29,7 +29,7 @@ public static void SetLeft(DependencyObject obj, double value)
 			=> SetLeftValue(obj, value);
 
 
-		[GeneratedDependencyProperty(DefaultValue = 0.0d, AttachedBackingFieldOwner = typeof(UIElement), Attached = true)]
+		[GeneratedDependencyProperty(DefaultValue = 0.0d, AttachedBackingFieldOwner = typeof(UIElement), Attached = true, Options = FrameworkPropertyMetadataOptions.AutoConvert)]
 		public static DependencyProperty LeftProperty { get ; } = CreateLeftProperty();
 
 		private static void OnLeftChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs args)
@@ -54,7 +54,7 @@ public static double GetTop(DependencyObject obj)
 		public static void SetTop(DependencyObject obj, double value)
 			=> SetTopValue(obj, value);
 
-		[GeneratedDependencyProperty(DefaultValue = 0.0d, AttachedBackingFieldOwner = typeof(UIElement), Attached = true)]
+		[GeneratedDependencyProperty(DefaultValue = 0.0d, AttachedBackingFieldOwner = typeof(UIElement), Attached = true, Options = FrameworkPropertyMetadataOptions.AutoConvert)]
 		public static DependencyProperty TopProperty { get ; } = CreateTopProperty();
 
 		private static void OnTopChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs args)
@@ -79,7 +79,7 @@ public static double GetZIndex(DependencyObject obj)
 		public static void SetZIndex(DependencyObject obj, double value)
 			=> SetZIndexValue(obj, value);
 
-		[GeneratedDependencyProperty(DefaultValue = 0.0d, AttachedBackingFieldOwner = typeof(UIElement), Attached = true)]
+		[GeneratedDependencyProperty(DefaultValue = 0.0d, AttachedBackingFieldOwner = typeof(UIElement), Attached = true, Options = FrameworkPropertyMetadataOptions.AutoConvert)]
 		public static DependencyProperty ZIndexProperty { get ; } = CreateZIndexProperty();
 
 		private static void OnZIndexChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs args)