feat(shapes): Finished the implementation of GeometryGroup in Wasm/SVG

carldebilly · davidjohnoliver · commit d322267a2ba8 · 2021-08-02T05:43:14.000-04:00
diff --git a/src/Uno.UI/UI/Xaml/Media/EllipseGeometry.wasm.cs b/src/Uno.UI/UI/Xaml/Media/EllipseGeometry.wasm.cs
@@ -1,4 +1,5 @@
 ﻿#nullable enable
+using System;
 using Uno.Extensions;
 using Uno.UI.DataBinding;
 using Windows.UI.Xaml.Wasm;
@@ -12,25 +13,31 @@ partial class EllipseGeometry
 		partial void InitPartials()
 		{
 			this.RegisterDisposablePropertyChangedCallback(OnPropertyChanged);
+#if DEBUG
+			_svgElement.SetAttribute("uno-geometry-type", "EllipseGeometry");
+#endif
 		}
 
 		private void OnPropertyChanged(ManagedWeakReference instance, DependencyProperty property, DependencyPropertyChangedEventArgs args)
 		{
-			if(property == CenterProperty)
+			if (property == CenterProperty)
 			{
 				var center = Center;
 
 				_svgElement.SetAttribute(
 					("cx", center.X.ToStringInvariant()),
 					("cy", center.Y.ToStringInvariant()));
+				_svgElement.InvalidateMeasure();
 			}
 			else if (property == RadiusXProperty)
 			{
 				_svgElement.SetAttribute("rx", RadiusX.ToStringInvariant());
+				_svgElement.InvalidateMeasure();
 			}
 			else if (property == RadiusYProperty)
 			{
 				_svgElement.SetAttribute("ry", RadiusY.ToStringInvariant());
+				_svgElement.InvalidateMeasure();
 			}
 		}
 
diff --git a/src/Uno.UI/UI/Xaml/Media/GeometryGroup.wasm.cs b/src/Uno.UI/UI/Xaml/Media/GeometryGroup.wasm.cs
@@ -1,19 +1,25 @@
 ﻿#nullable enable
 using System;
 using Uno.UI.DataBinding;
+using Windows.Foundation.Collections;
 using Windows.UI.Xaml.Wasm;
 
 namespace Windows.UI.Xaml.Media
 {
 	partial class GeometryGroup
 	{
-		private SvgElement _svgElement = new SvgElement("ellipse");
+		private SvgElement _svgElement = new SvgElement("g");
 
 		partial void InitPartials()
 		{
 			this.RegisterDisposablePropertyChangedCallback(OnPropertyChanged);
 
+			Children.VectorChanged += OnGeometriesChanged;
+
 			_svgElement.SetAttribute("fill-rule", "evenodd");
+#if DEBUG
+			_svgElement.SetAttribute("uno-geometry-type", "GeometryGroup");
+#endif
 		}
 
 		private void OnPropertyChanged(ManagedWeakReference instance, DependencyProperty property, DependencyPropertyChangedEventArgs args)
@@ -30,7 +36,34 @@ private void OnPropertyChanged(ManagedWeakReference instance, DependencyProperty
 			}
 			else if (property == ChildrenProperty)
 			{
-				// TODO!!
+				_svgElement.ClearChildren();
+
+				if(args.OldValue is GeometryCollection oldGeometries)
+				{
+					oldGeometries.VectorChanged -= OnGeometriesChanged;
+				}
+
+				if(args.NewValue is GeometryCollection newGeometries)
+				{
+					newGeometries.VectorChanged += OnGeometriesChanged;
+
+					newGeometries.SetParent(this);
+
+					foreach (var child in Children)
+					{
+						_svgElement.AddChild(child.GetSvgElement());
+					}
+				}
+			}
+		}
+
+		private void OnGeometriesChanged(IObservableVector<Geometry> sender, IVectorChangedEventArgs @event)
+		{
+			_svgElement.ClearChildren();
+
+			foreach (var child in Children)
+			{
+				_svgElement.AddChild(child.GetSvgElement());
 			}
 		}
 
diff --git a/src/Uno.UI/UI/Xaml/Media/LineGeometry.wasm.cs b/src/Uno.UI/UI/Xaml/Media/LineGeometry.wasm.cs
@@ -12,9 +12,12 @@ partial class LineGeometry
 		partial void InitPartials()
 		{
 			this.RegisterDisposablePropertyChangedCallback(OnPropertyChanged);
+#if DEBUG
+			_svgElement.SetAttribute("uno-geometry-type", "LineGeometry");
+#endif
 		}
 
-		private void OnPropertyChanged(ManagedWeakReference instance, DependencyProperty property, DependencyPropertyChangedEventArgs args)
+			private void OnPropertyChanged(ManagedWeakReference instance, DependencyProperty property, DependencyPropertyChangedEventArgs args)
 		{
 			if (property == StartPointProperty)
 			{
diff --git a/src/Uno.UI/UI/Xaml/Media/PathGeometry.wasm.cs b/src/Uno.UI/UI/Xaml/Media/PathGeometry.wasm.cs
@@ -18,6 +18,9 @@ partial void InitPartials()
 			this.RegisterDisposablePropertyChangedCallback(OnPropertyChanged);
 
 			_svgElement.SetAttribute("fill-rule", "evenodd");
+#if DEBUG
+			_svgElement.SetAttribute("uno-geometry-type", "PathGeometry");
+#endif
 		}
 
 		private void OnPropertyChanged(ManagedWeakReference instance, DependencyProperty property, DependencyPropertyChangedEventArgs args)
diff --git a/src/Uno.UI/UI/Xaml/Media/RectangleGeometry.wasm.cs b/src/Uno.UI/UI/Xaml/Media/RectangleGeometry.wasm.cs
@@ -12,6 +12,9 @@ partial class RectangleGeometry
 		partial void InitPartials()
 		{
 			this.RegisterDisposablePropertyChangedCallback(OnPropertyChanged);
+#if DEBUG
+			_svgElement.SetAttribute("uno-geometry-type", "RectangleGeometry");
+#endif
 		}
 
 		private void OnPropertyChanged(ManagedWeakReference instance, DependencyProperty property, DependencyPropertyChangedEventArgs args)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#nullable enable`
	`2`	`+using System;`
`2`	`3`	`using Uno.Extensions;`
`3`	`4`	`using Uno.UI.DataBinding;`
`4`	`5`	`using Windows.UI.Xaml.Wasm;`
`@@ -12,25 +13,31 @@ partial class EllipseGeometry`
`12`	`13`	`partial void InitPartials()`
`13`	`14`	`{`
`14`	`15`	`this.RegisterDisposablePropertyChangedCallback(OnPropertyChanged);`
	`16`	`+#if DEBUG`
	`17`	`+ _svgElement.SetAttribute("uno-geometry-type", "EllipseGeometry");`
	`18`	`+#endif`
`15`	`19`	`}`
`16`	`20`
`17`	`21`	`private void OnPropertyChanged(ManagedWeakReference instance, DependencyProperty property, DependencyPropertyChangedEventArgs args)`
`18`	`22`	`{`
`19`		`- if(property == CenterProperty)`
	`23`	`+ if (property == CenterProperty)`
`20`	`24`	`{`
`21`	`25`	`var center = Center;`
`22`	`26`
`23`	`27`	`_svgElement.SetAttribute(`
`24`	`28`	`("cx", center.X.ToStringInvariant()),`
`25`	`29`	`("cy", center.Y.ToStringInvariant()));`
	`30`	`+ _svgElement.InvalidateMeasure();`
`26`	`31`	`}`
`27`	`32`	`else if (property == RadiusXProperty)`
`28`	`33`	`{`
`29`	`34`	`_svgElement.SetAttribute("rx", RadiusX.ToStringInvariant());`
	`35`	`+ _svgElement.InvalidateMeasure();`
`30`	`36`	`}`
`31`	`37`	`else if (property == RadiusYProperty)`
`32`	`38`	`{`
`33`	`39`	`_svgElement.SetAttribute("ry", RadiusY.ToStringInvariant());`
	`40`	`+ _svgElement.InvalidateMeasure();`
`34`	`41`	`}`
`35`	`42`	`}`
`36`	`43`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,12 @@ partial class LineGeometry`
`12`	`12`	`partial void InitPartials()`
`13`	`13`	`{`
`14`	`14`	`this.RegisterDisposablePropertyChangedCallback(OnPropertyChanged);`
	`15`	`+#if DEBUG`
	`16`	`+ _svgElement.SetAttribute("uno-geometry-type", "LineGeometry");`
	`17`	`+#endif`
`15`	`18`	`}`
`16`	`19`
`17`		`- private void OnPropertyChanged(ManagedWeakReference instance, DependencyProperty property, DependencyPropertyChangedEventArgs args)`
	`20`	`+ private void OnPropertyChanged(ManagedWeakReference instance, DependencyProperty property, DependencyPropertyChangedEventArgs args)`
`18`	`21`	`{`
`19`	`22`	`if (property == StartPointProperty)`
`20`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@ partial void InitPartials()`
`18`	`18`	`this.RegisterDisposablePropertyChangedCallback(OnPropertyChanged);`
`19`	`19`
`20`	`20`	`_svgElement.SetAttribute("fill-rule", "evenodd");`
	`21`	`+#if DEBUG`
	`22`	`+ _svgElement.SetAttribute("uno-geometry-type", "PathGeometry");`
	`23`	`+#endif`
`21`	`24`	`}`
`22`	`25`
`23`	`26`	`private void OnPropertyChanged(ManagedWeakReference instance, DependencyProperty property, DependencyPropertyChangedEventArgs args)`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,9 @@ partial class RectangleGeometry`
`12`	`12`	`partial void InitPartials()`
`13`	`13`	`{`
`14`	`14`	`this.RegisterDisposablePropertyChangedCallback(OnPropertyChanged);`
	`15`	`+#if DEBUG`
	`16`	`+ _svgElement.SetAttribute("uno-geometry-type", "RectangleGeometry");`
	`17`	`+#endif`
`15`	`18`	`}`
`16`	`19`
`17`	`20`	`private void OnPropertyChanged(ManagedWeakReference instance, DependencyProperty property, DependencyPropertyChangedEventArgs args)`