Merge branch 'main' into winui

azchohfi · azchohfi · commit 1f6630e48a70 · 2021-09-16T09:16:38.000-07:00
# Conflicts:
#	CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/ScalarNode.cs
#	CommunityToolkit.WinUI.UI.Animations/Extensions/System/FloatExtensions.cs
diff --git a/CommunityToolkit.Mvvm/ComponentModel/Attributes/AlsoNotifyChangeForAttribute.cs b/CommunityToolkit.Mvvm/ComponentModel/Attributes/AlsoNotifyChangeForAttribute.cs
@@ -67,7 +67,7 @@ namespace CommunityToolkit.Mvvm.ComponentModel
     /// }
     /// </code>
     /// </summary>
-    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = true, Inherited = false)]
     public sealed class AlsoNotifyChangeForAttribute : Attribute
     {
         /// <summary>
@@ -87,7 +87,7 @@ public AlsoNotifyChangeForAttribute(string propertyName)
         /// The other property names to also notify when the annotated property changes. This parameter can optionally
         /// be used to indicate a series of dependent properties from the same attribute, to keep the code more compact.
         /// </param>
-        public AlsoNotifyChangeForAttribute(string propertyName, string[] otherPropertyNames)
+        public AlsoNotifyChangeForAttribute(string propertyName, params string[] otherPropertyNames)
         {
             PropertyNames = new[] { propertyName }.Concat(otherPropertyNames).ToArray();
         }
diff --git a/CommunityToolkit.WinUI.UI.Animations/Expressions/CompositionExtensions.cs b/CommunityToolkit.WinUI.UI.Animations/Expressions/CompositionExtensions.cs
@@ -176,6 +176,8 @@ public static void StartAnimation(this CompositionObject compObject, string prop
         /// <param name="easing">The easing function to use when interpolating between frames.</param>
         public static void InsertExpressionKeyFrame(this KeyFrameAnimation keyframeAnimation, float normalizedProgressKey, ExpressionNode expressionNode, CompositionEasingFunction easing = null)
         {
+            expressionNode.ClearReferenceInfo();
+
             keyframeAnimation.InsertExpressionKeyFrame(normalizedProgressKey, expressionNode.ToExpressionString(), easing);
 
             expressionNode.SetAllParameters(keyframeAnimation);
@@ -252,6 +254,7 @@ private static ExpressionAnimation CreateExpressionAnimationFromNode(Compositor
             // Only create a new animation if this node hasn't already generated one before, so we don't have to re-parse the expression string.
             if (expressionNode.ExpressionAnimation == null)
             {
+                expressionNode.ClearReferenceInfo();
                 expressionNode.ExpressionAnimation = compositor.CreateExpressionAnimation(expressionNode.ToExpressionString());
             }
 
diff --git a/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs b/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs
@@ -260,6 +260,20 @@ internal string ToExpressionString()
             return ToExpressionStringInternal();
         }
 
+        /// <summary>
+        /// Clears the reference information.
+        /// </summary>
+        /// <exception cref="System.Exception">Reference and paramName can't both be null</exception>
+        internal void ClearReferenceInfo()
+        {
+            _objRefList = null;
+            ParamName = null;
+            foreach (var child in Children)
+            {
+                child.ClearReferenceInfo();
+            }
+        }
+
         /// <summary>
         /// Ensures the reference information.
         /// </summary>
diff --git a/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/Matrix3x2Node.cs b/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/Matrix3x2Node.cs
@@ -332,7 +332,7 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            return $"Matrix3x2({_value.M11},{_value.M12},{_value.M21},{_value.M22},{_value.M31},{_value.M32})";
+            return $"Matrix3x2({_value.M11.ToCompositionString()},{_value.M12.ToCompositionString()},{_value.M21.ToCompositionString()},{_value.M22.ToCompositionString()},{_value.M31.ToCompositionString()},{_value.M32.ToCompositionString()})";
         }
 
         private Matrix3x2 _value;
diff --git a/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.cs b/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/Matrix4x4Node.cs
@@ -403,10 +403,10 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            return $"Matrix4x4({_value.M11},{_value.M12},{_value.M13},{_value.M14}," +
-                             $"{_value.M21},{_value.M22},{_value.M23},{_value.M24}," +
-                             $"{_value.M31},{_value.M32},{_value.M33},{_value.M34}," +
-                             $"{_value.M41},{_value.M42},{_value.M43},{_value.M44})";
+            return $"Matrix4x4({_value.M11.ToCompositionString()},{_value.M12.ToCompositionString()},{_value.M13.ToCompositionString()},{_value.M14.ToCompositionString()}," +
+                             $"{_value.M21.ToCompositionString()},{_value.M22.ToCompositionString()},{_value.M23.ToCompositionString()},{_value.M24.ToCompositionString()}," +
+                             $"{_value.M31.ToCompositionString()},{_value.M32.ToCompositionString()},{_value.M33.ToCompositionString()},{_value.M34.ToCompositionString()}," +
+                             $"{_value.M41.ToCompositionString()},{_value.M42.ToCompositionString()},{_value.M43.ToCompositionString()},{_value.M44.ToCompositionString()})";
         }
 
         private Matrix4x4 _value;
diff --git a/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/QuaternionNode.cs b/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/QuaternionNode.cs
@@ -126,7 +126,7 @@ public static implicit operator QuaternionNode(Quaternion value)
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            return $"Quaternion({_value.X},{_value.Y},{_value.Z},{_value.W})";
+            return $"Quaternion({_value.X.ToCompositionString()},{_value.Y.ToCompositionString()},{_value.Z.ToCompositionString()},{_value.W.ToCompositionString()})";
         }
 
         private Quaternion _value;
diff --git a/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/ScalarNode.cs b/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/ScalarNode.cs
@@ -254,8 +254,7 @@ public static implicit operator ScalarNode(int value)
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            // Important to use invariant culture to make sure that floats are written using a .
-            return _value.ToString(global::System.Globalization.CultureInfo.InvariantCulture);
+            return _value.ToCompositionString();
         }
 
         private float _value;
diff --git a/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/Vector2Node.cs b/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/Vector2Node.cs
@@ -297,7 +297,7 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            return $"Vector2({_value.X},{_value.Y})";
+            return $"Vector2({_value.X.ToCompositionString()},{_value.Y.ToCompositionString()})";
         }
 
         private Vector2 _value;
diff --git a/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/Vector3Node.cs b/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/Vector3Node.cs
@@ -320,7 +320,7 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            return $"Vector3({_value.X},{_value.Y},{_value.Z})";
+            return $"Vector3({_value.X.ToCompositionString()},{_value.Y.ToCompositionString()},{_value.Z.ToCompositionString()})";
         }
 
         private Vector3 _value;
diff --git a/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/Vector4Node.cs b/CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/Vector4Node.cs
@@ -343,7 +343,7 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,
         /// <returns>System.String.</returns>
         protected internal override string GetValue()
         {
-            return $"Vector4({_value.X},{_value.Y},{_value.Z},{_value.W})";
+            return $"Vector4({_value.X.ToCompositionString()},{_value.Y.ToCompositionString()},{_value.Z.ToCompositionString()},{_value.W.ToCompositionString()})";
         }
 
         private Vector4 _value;
diff --git a/CommunityToolkit.WinUI.UI.Animations/Extensions/System/FloatExtensions.cs b/CommunityToolkit.WinUI.UI.Animations/Extensions/System/FloatExtensions.cs
@@ -0,0 +1,48 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.Contracts;
+
+namespace CommunityToolkit.WinUI.UI.Animations
+{
+    /// <summary>
+    /// An extension <see langword="class"/> for the <see cref="float"/> type
+    /// </summary>
+    internal static class FloatExtensions
+    {
+        /// <summary>
+        /// Returns a <see cref="string"/> representation of a <see cref="float"/> that avoids scientific notation, which is not compatible with the composition expression animations API
+        /// </summary>
+        /// <param name="number">The input <see cref="float"/> to process</param>
+        /// <returns>A <see cref="string"/> representation of <paramref name="number"/> that can be used in a expression animation</returns>
+        [Pure]
+        public static string ToCompositionString(this float number)
+        {
+            var defaultString = number.ToString(System.Globalization.CultureInfo.InvariantCulture);
+            var eIndex = defaultString.IndexOf('E');
+
+            // If the default string representation is not in scientific notation, we can use it
+            if (eIndex == -1)
+            {
+                return defaultString;
+            }
+
+            // If the number uses scientific notation because it is too large, we can print it without the decimal places
+            var exponent = int.Parse(defaultString.Substring(eIndex + 1));
+            if (exponent >= 0)
+            {
+                return number.ToString($"F0", System.Globalization.CultureInfo.InvariantCulture);
+            }
+
+            // Otherwise, we need to print it with the right number of decimals
+            var decimalPlaces = -exponent // The number of decimal places is the exponent of 10
+                + eIndex // Plus each character in the mantissa
+                + (number < 0 ?
+                    -3 : // Minus the sign, dot and first number of the mantissa if negative
+                    -2); // Minus the dot and first number of the mantissa otherwise
+
+            return number.ToString($"F{decimalPlaces}", System.Globalization.CultureInfo.InvariantCulture);
+        }
+    }
+}
diff --git a/CommunityToolkit.WinUI.UI.Controls.Input/RangeSelector/RangeSelector.Input.Drag.cs b/CommunityToolkit.WinUI.UI.Controls.Input/RangeSelector/RangeSelector.Input.Drag.cs
@@ -19,7 +19,7 @@ private void MinThumb_DragDelta(object sender, DragDeltaEventArgs e)
         {
             _absolutePosition += e.HorizontalChange;
 
-            RangeStart = DragThumb(_minThumb, 0, Canvas.GetLeft(_maxThumb), _absolutePosition);
+            RangeStart = DragThumb(_minThumb, 0, DragWidth(), _absolutePosition);
 
             if (_toolTipText != null)
             {
@@ -31,7 +31,7 @@ private void MaxThumb_DragDelta(object sender, DragDeltaEventArgs e)
         {
             _absolutePosition += e.HorizontalChange;
 
-            RangeEnd = DragThumb(_maxThumb, Canvas.GetLeft(_minThumb), DragWidth(), _absolutePosition);
+            RangeEnd = DragThumb(_maxThumb, 0, DragWidth(), _absolutePosition);
 
             if (_toolTipText != null)
             {
diff --git a/CommunityToolkit.WinUI.UI.Controls.Input/RangeSelector/RangeSelector.Input.Pointer.cs b/CommunityToolkit.WinUI.UI.Controls.Input/RangeSelector/RangeSelector.Input.Pointer.cs
@@ -76,14 +76,14 @@ private void ContainerCanvas_PointerMoved(object sender, PointerRoutedEventArgs
             var position = e.GetCurrentPoint(_containerCanvas).Position.X;
             var normalizedPosition = ((position / DragWidth()) * (Maximum - Minimum)) + Minimum;
 
-            if (_pointerManipulatingMin && normalizedPosition < RangeEnd)
+            if (_pointerManipulatingMin)
             {
-                RangeStart = DragThumb(_minThumb, 0, Canvas.GetLeft(_maxThumb), position);
+                RangeStart = DragThumb(_minThumb, 0, DragWidth(), position);
                 UpdateToolTipText(this, _toolTipText, RangeStart);
             }
-            else if (_pointerManipulatingMax && normalizedPosition > RangeStart)
+            else if (_pointerManipulatingMax)
             {
-                RangeEnd = DragThumb(_maxThumb, Canvas.GetLeft(_minThumb), DragWidth(), position);
+                RangeEnd = DragThumb(_maxThumb, 0, DragWidth(), position);
                 UpdateToolTipText(this, _toolTipText, RangeEnd);
             }
         }
diff --git a/CommunityToolkit.WinUI.UI/Helpers/ThemeListener.cs b/CommunityToolkit.WinUI.UI/Helpers/ThemeListener.cs
@@ -78,23 +78,26 @@ public ThemeListener(DispatcherQueue dispatcherQueue = null)
             }
         }
 
-        private void Accessible_HighContrastChanged(AccessibilitySettings sender, object args)
+        private async void Accessible_HighContrastChanged(AccessibilitySettings sender, object args)
         {
 #if DEBUG
             global::System.Diagnostics.Debug.WriteLine("HighContrast Changed");
 #endif
 
-            UpdateProperties();
+            await OnThemePropertyChangedAsync();
         }
 
         // Note: This can get called multiple times during HighContrast switch, do we care?
         private async void Settings_ColorValuesChanged(UISettings sender, object args)
         {
-            await OnColorValuesChanged();
+            await OnThemePropertyChangedAsync();
         }
 
-        // Internal abstraction is used by the Unit Tests
-        internal Task OnColorValuesChanged()
+        /// <summary>
+        /// Dispatches an update for the public properties and the firing of <see cref="ThemeChanged"/> on <see cref="DispatcherQueue"/>.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> that indicates when the dispatching has completed.</returns>
+        internal Task OnThemePropertyChangedAsync()
         {
             // Getting called off thread, so we need to dispatch to request value.
             return DispatcherQueue.EnqueueAsync(
diff --git a/CommunityToolkit.WinUI.UI/Shadows/AttachedDropShadow.cs b/CommunityToolkit.WinUI.UI/Shadows/AttachedDropShadow.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Linq;
 using System.Numerics;
 using Microsoft.UI;
@@ -166,6 +167,16 @@ protected internal override void OnElementContextUninitialized(AttachedShadowEle
                 _container.Children.Remove(context.SpriteVisual);
             }
 
+            context.SpriteVisual?.StopAnimation("Size");
+
+            context.Element.LayoutUpdated -= Element_LayoutUpdated;
+
+            if (context.VisibilityToken != null)
+            {
+                context.Element.UnregisterPropertyChangedCallback(UIElement.VisibilityProperty, context.VisibilityToken.Value);
+                context.VisibilityToken = null;
+            }
+
             base.OnElementContextUninitialized(context);
         }
 
@@ -176,6 +187,50 @@ protected override void SetElementChildVisual(AttachedShadowElementContext conte
             {
                 _container.Children.InsertAtTop(context.SpriteVisual);
             }
+
+            // Handles size changing and other elements around it updating.
+            context.Element.LayoutUpdated -= Element_LayoutUpdated;
+            context.Element.LayoutUpdated += Element_LayoutUpdated;
+
+            if (context.VisibilityToken != null)
+            {
+                context.Element.UnregisterPropertyChangedCallback(UIElement.VisibilityProperty, context.VisibilityToken.Value);
+                context.VisibilityToken = null;
+            }
+
+            context.VisibilityToken = context.Element.RegisterPropertyChangedCallback(UIElement.VisibilityProperty, Element_VisibilityChanged);
+        }
+
+        private void Element_LayoutUpdated(object sender, object e)
+        {
+            // Update other shadows to account for layout changes
+            CastToElement_SizeChanged(null, null);
+        }
+
+        private void Element_VisibilityChanged(DependencyObject sender, DependencyProperty dp)
+        {
+            if (sender is FrameworkElement element)
+            {
+                var context = GetElementContext(element);
+
+                if (element.Visibility == Visibility.Collapsed)
+                {
+                    if (_container != null && _container.Children.Contains(context.SpriteVisual))
+                    {
+                        _container.Children.Remove(context.SpriteVisual);
+                    }
+                }
+                else
+                {
+                    if (_container != null && !_container.Children.Contains(context.SpriteVisual))
+                    {
+                        _container.Children.InsertAtTop(context.SpriteVisual);
+                    }
+                }
+            }
+
+            // Update other shadows to account for layout changes
+            CastToElement_SizeChanged(null, null);
         }
 
         /// <inheritdoc/>
@@ -255,12 +310,24 @@ protected override CompositionBrush GetShadowMask(AttachedShadowElementContext c
             }
 
             // Position our shadow in the correct spot to match the corresponding element.
-            context.SpriteVisual.Size = context.Element.RenderSize.ToVector2();
             context.SpriteVisual.Offset = context.Element.CoordinatesFrom(CastTo).ToVector3();
 
+            BindSizeAndScale(context.SpriteVisual, context.Element);
+
             return mask;
         }
 
+        private static void BindSizeAndScale(CompositionObject source, UIElement target)
+        {
+            var visual = ElementCompositionPreview.GetElementVisual(target);
+            var bindSizeAnimation = source.Compositor.CreateExpressionAnimation($"{nameof(visual)}.Size * {nameof(visual)}.Scale.XY");
+
+            bindSizeAnimation.SetReferenceParameter(nameof(visual), visual);
+
+            // Start the animation
+            source.StartAnimation("Size", bindSizeAnimation);
+        }
+
         private void CustomMaskedElement_Loaded(object sender, RoutedEventArgs e)
         {
             var context = GetElementContext(sender as FrameworkElement);
@@ -274,9 +341,6 @@ private void CustomMaskedElement_Loaded(object sender, RoutedEventArgs e)
         /// <inheritdoc/>
         protected internal override void OnSizeChanged(AttachedShadowElementContext context, Size newSize, Size previousSize)
         {
-            var sizeAsVec2 = newSize.ToVector2();
-
-            context.SpriteVisual.Size = sizeAsVec2;
             context.SpriteVisual.Offset = context.Element.CoordinatesFrom(CastTo).ToVector3();
 
             UpdateShadowClip(context);
diff --git a/CommunityToolkit.WinUI.UI/Shadows/AttachedShadowElementContext.cs b/CommunityToolkit.WinUI.UI/Shadows/AttachedShadowElementContext.cs
@@ -20,6 +20,8 @@ public sealed class AttachedShadowElementContext
 
         private Dictionary<string, object> _resources;
 
+        internal long? VisibilityToken { get; set; }
+
         /// <summary>
         /// Gets a value indicating whether or not this <see cref="AttachedShadowElementContext"/> has been initialized.
         /// </summary>
diff --git a/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservablePropertyAttribute.cs b/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservablePropertyAttribute.cs
@@ -71,7 +71,7 @@ public void Test_AlsoNotifyChangeForAttribute_Events()
             model.Name = "Bob";
             model.Surname = "Ross";
 
-            CollectionAssert.AreEqual(new[] { nameof(model.Name), nameof(model.FullName), nameof(model.Surname), nameof(model.FullName) }, propertyNames);
+            CollectionAssert.AreEqual(new[] { nameof(model.Name), nameof(model.FullName), nameof(model.Alias), nameof(model.Surname), nameof(model.FullName), nameof(model.Alias) }, propertyNames);
         }
 
         [TestCategory("Mvvm")]
@@ -169,13 +169,16 @@ public sealed partial class DependentPropertyModel
         {
             [ObservableProperty]
             [AlsoNotifyChangeFor(nameof(FullName))]
+            [AlsoNotifyChangeFor(nameof(Alias))]
             private string? name;
 
             [ObservableProperty]
-            [AlsoNotifyChangeFor(nameof(FullName))]
+            [AlsoNotifyChangeFor(nameof(FullName), nameof(Alias))]
             private string? surname;
 
             public string FullName => $"{Name} {Surname}";
+
+            public string Alias => $"{Name?.ToLower()}{Surname?.ToLower()}";
         }
 
         public partial class MyFormViewModel : ObservableValidator
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_ThemeListener_Threading.cs b/UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_ThemeListener_Threading.cs

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ namespace CommunityToolkit.Mvvm.ComponentModel`
`67`	`67`	`/// }`
`68`	`68`	`/// </code>`
`69`	`69`	`/// </summary>`
`70`		`- [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]`
	`70`	`+ [AttributeUsage(AttributeTargets.Field, AllowMultiple = true, Inherited = false)]`
`71`	`71`	`public sealed class AlsoNotifyChangeForAttribute : Attribute`
`72`	`72`	`{`
`73`	`73`	`/// <summary>`
`@@ -87,7 +87,7 @@ public AlsoNotifyChangeForAttribute(string propertyName)`
`87`	`87`	`/// The other property names to also notify when the annotated property changes. This parameter can optionally`
`88`	`88`	`/// be used to indicate a series of dependent properties from the same attribute, to keep the code more compact.`
`89`	`89`	`/// </param>`
`90`		`- public AlsoNotifyChangeForAttribute(string propertyName, string[] otherPropertyNames)`
	`90`	`+ public AlsoNotifyChangeForAttribute(string propertyName, params string[] otherPropertyNames)`
`91`	`91`	`{`
`92`	`92`	`PropertyNames = new[] { propertyName }.Concat(otherPropertyNames).ToArray();`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,8 @@ public static void StartAnimation(this CompositionObject compObject, string prop`
`176`	`176`	`/// <param name="easing">The easing function to use when interpolating between frames.</param>`
`177`	`177`	`public static void InsertExpressionKeyFrame(this KeyFrameAnimation keyframeAnimation, float normalizedProgressKey, ExpressionNode expressionNode, CompositionEasingFunction easing = null)`
`178`	`178`	`{`
	`179`	`+ expressionNode.ClearReferenceInfo();`
	`180`	`+`
`179`	`181`	`keyframeAnimation.InsertExpressionKeyFrame(normalizedProgressKey, expressionNode.ToExpressionString(), easing);`
`180`	`182`
`181`	`183`	`expressionNode.SetAllParameters(keyframeAnimation);`
`@@ -252,6 +254,7 @@ private static ExpressionAnimation CreateExpressionAnimationFromNode(Compositor`
`252`	`254`	`// Only create a new animation if this node hasn't already generated one before, so we don't have to re-parse the expression string.`
`253`	`255`	`if (expressionNode.ExpressionAnimation == null)`
`254`	`256`	`{`
	`257`	`+ expressionNode.ClearReferenceInfo();`
`255`	`258`	`expressionNode.ExpressionAnimation = compositor.CreateExpressionAnimation(expressionNode.ToExpressionString());`
`256`	`259`	`}`
`257`	`260`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,`
`332`	`332`	`/// <returns>System.String.</returns>`
`333`	`333`	`protected internal override string GetValue()`
`334`	`334`	`{`
`335`		`- return $"Matrix3x2({_value.M11},{_value.M12},{_value.M21},{_value.M22},{_value.M31},{_value.M32})";`
	`335`	`+ return $"Matrix3x2({_value.M11.ToCompositionString()},{_value.M12.ToCompositionString()},{_value.M21.ToCompositionString()},{_value.M22.ToCompositionString()},{_value.M31.ToCompositionString()},{_value.M32.ToCompositionString()})";`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`private Matrix3x2 _value;`
Original file line number	Diff line number	Diff line change
`@@ -403,10 +403,10 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,`
`403`	`403`	`/// <returns>System.String.</returns>`
`404`	`404`	`protected internal override string GetValue()`
`405`	`405`	`{`
`406`		`- return $"Matrix4x4({_value.M11},{_value.M12},{_value.M13},{_value.M14}," +`
`407`		`- $"{_value.M21},{_value.M22},{_value.M23},{_value.M24}," +`
`408`		`- $"{_value.M31},{_value.M32},{_value.M33},{_value.M34}," +`
`409`		`- $"{_value.M41},{_value.M42},{_value.M43},{_value.M44})";`
	`406`	`+ return $"Matrix4x4({_value.M11.ToCompositionString()},{_value.M12.ToCompositionString()},{_value.M13.ToCompositionString()},{_value.M14.ToCompositionString()}," +`
	`407`	`+ $"{_value.M21.ToCompositionString()},{_value.M22.ToCompositionString()},{_value.M23.ToCompositionString()},{_value.M24.ToCompositionString()}," +`
	`408`	`+ $"{_value.M31.ToCompositionString()},{_value.M32.ToCompositionString()},{_value.M33.ToCompositionString()},{_value.M34.ToCompositionString()}," +`
	`409`	`+ $"{_value.M41.ToCompositionString()},{_value.M42.ToCompositionString()},{_value.M43.ToCompositionString()},{_value.M44.ToCompositionString()})";`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`private Matrix4x4 _value;`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public static implicit operator QuaternionNode(Quaternion value)`
`126`	`126`	`/// <returns>System.String.</returns>`
`127`	`127`	`protected internal override string GetValue()`
`128`	`128`	`{`
`129`		`- return $"Quaternion({_value.X},{_value.Y},{_value.Z},{_value.W})";`
	`129`	`+ return $"Quaternion({_value.X.ToCompositionString()},{_value.Y.ToCompositionString()},{_value.Z.ToCompositionString()},{_value.W.ToCompositionString()})";`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`private Quaternion _value;`
Original file line number	Diff line number	Diff line change
`@@ -254,8 +254,7 @@ public static implicit operator ScalarNode(int value)`
`254`	`254`	`/// <returns>System.String.</returns>`
`255`	`255`	`protected internal override string GetValue()`
`256`	`256`	`{`
`257`		`- // Important to use invariant culture to make sure that floats are written using a .`
`258`		`- return _value.ToString(global::System.Globalization.CultureInfo.InvariantCulture);`
	`257`	`+ return _value.ToCompositionString();`
`259`	`258`	`}`
`260`	`259`
`261`	`260`	`private float _value;`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,`
`297`	`297`	`/// <returns>System.String.</returns>`
`298`	`298`	`protected internal override string GetValue()`
`299`	`299`	`{`
`300`		`- return $"Vector2({_value.X},{_value.Y})";`
	`300`	`+ return $"Vector2({_value.X.ToCompositionString()},{_value.Y.ToCompositionString()})";`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`private Vector2 _value;`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,`
`320`	`320`	`/// <returns>System.String.</returns>`
`321`	`321`	`protected internal override string GetValue()`
`322`	`322`	`{`
`323`		`- return $"Vector3({_value.X},{_value.Y},{_value.Z})";`
	`323`	`+ return $"Vector3({_value.X.ToCompositionString()},{_value.Y.ToCompositionString()},{_value.Z.ToCompositionString()})";`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`private Vector3 _value;`
Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ public Matrix4x4Node GetSubchannels(Subchannel s1, Subchannel s2, Subchannel s3,`
`343`	`343`	`/// <returns>System.String.</returns>`
`344`	`344`	`protected internal override string GetValue()`
`345`	`345`	`{`
`346`		`- return $"Vector4({_value.X},{_value.Y},{_value.Z},{_value.W})";`
	`346`	`+ return $"Vector4({_value.X.ToCompositionString()},{_value.Y.ToCompositionString()},{_value.Z.ToCompositionString()},{_value.W.ToCompositionString()})";`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`private Vector4 _value;`