Add Vector3 support for Sample Bindings

Add additional shortcuts/fallbacks for parsing other Vector formats to different types

Author: michael-hawker

Microsoft.Toolkit.Uwp.SampleApp/Common/Vector3Converter.cs

@@ -0,0 +1,57 @@
+// 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;
+using System.Linq;
+using System.Numerics;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+
+namespace Microsoft.Toolkit.Uwp.SampleApp.Common
+{
+    public class Vector3Converter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is string)
+            {
+                return value;
+            }
+
+            var thickness = (Vector3)value;
+
+            return thickness.ToString().TrimStart('<').Replace(" ", string.Empty).TrimEnd('>');
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            if (value is string vectorString)
+            {
+                var vectorTokens = vectorString.Split(',')
+                                                     .Where(tkn => !string.IsNullOrWhiteSpace(tkn))
+                                                     .ToArray();
+                switch (vectorTokens.Length)
+                {
+                    case 1:
+                        var vectorValue = float.Parse(vectorString);
+                        return new Vector3(vectorValue, vectorValue, vectorValue);
+                    case 2:
+                        var xValue = float.Parse(vectorTokens[0]);
+                        var yValue = float.Parse(vectorTokens[1]);
+
+                        return new Vector3(xValue, yValue, 0);
+                    case 3:
+                        return new Vector3(
+                            float.Parse(vectorTokens[0]),
+                            float.Parse(vectorTokens[1]),
+                            float.Parse(vectorTokens[2]));
+                    default:
+                        return default(Vector3);
+                }
+            }
+
+            return value.ToString();
+        }
+    }
+}

Microsoft.Toolkit.Uwp.SampleApp/Controls/PropertyControl.xaml.cs

@@ -179,6 +179,14 @@ private void PropertyControl_OnDataContextChanged(FrameworkElement sender, DataC
                             converter = new ThicknessConverter();
                             break;
 
+                        case PropertyKind.Vector3:
+                            var vectorTextBox = new TextBox { Text = (propertyDict[option.Name] as ValueHolder).Value.ToString() };
+
+                            controlToAdd = vectorTextBox;
+                            dependencyProperty = TextBox.TextProperty;
+                            converter = new Vector3Converter();
+                            break;
+
                         default:
                             var textBox = new TextBox { Text = (propertyDict[option.Name] as ValueHolder).Value.ToString() };
 

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

@@ -488,6 +488,7 @@
     <Content Include="SamplePages\DataGrid\DataGridCode.bind" />
     <Content Include="SamplePages\ViewportBehavior\ViewportBehaviorCode.bind" />
     <Compile Include="Common\TextBlockHyperlinkBehavior.cs" />
+    <Compile Include="Common\Vector3Converter.cs" />
     <Compile Include="SamplePages\AutoFocusBehavior\AutoFocusBehaviorPage.xaml.cs">
       <DependentUpon>AutoFocusBehaviorPage.xaml</DependentUpon>
     </Compile>
@@ -663,7 +664,6 @@
     <Compile Include="SamplePages\UniformGrid\UniformGridPage.xaml.cs">
       <DependentUpon>UniformGridPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Models\PropertyDescriptor\ThicknessPropertyOptions.cs" />
     <Compile Include="Models\ThemeChangedArgs.cs" />
     <Compile Include="Pages\SampleController.xaml.cs">
       <DependentUpon>SampleController.xaml</DependentUpon>

Microsoft.Toolkit.Uwp.SampleApp/Models/PropertyDescriptor/PropertyKind.cs

@@ -13,6 +13,7 @@ public enum PropertyKind
         Bool,
         Brush,
         TimeSpan,
-        Thickness
+        Thickness,
+        Vector3,
     }
 }

Microsoft.Toolkit.Uwp.SampleApp/Models/PropertyDescriptor/ThicknessPropertyOptions.cs

@@ -418,8 +418,12 @@ public string UpdatedXamlCode
                 {
                     if (proxy[option.Name] is ValueHolder value)
                     {
-                        var newString = value.Value is Windows.UI.Xaml.Media.SolidColorBrush brush ?
-                                            brush.Color.ToString() : value.Value.ToString();
+                        var newString = value.Value switch
+                        {
+                            Windows.UI.Xaml.Media.SolidColorBrush brush => brush.Color.ToString(),
+                            System.Numerics.Vector3 vector => vector.ToString().TrimStart('<').Replace(" ", string.Empty).TrimEnd('>'),
+                            _ => value.Value.ToString()
+                        };
 
                         result = result.Replace(option.OriginalString, newString);
                         result = result.Replace("@[" + option.Label + "]@", newString);
@@ -630,12 +634,27 @@ public async Task PreparePropertyDescriptorAsync()
                                 case PropertyKind.Thickness:
                                     try
                                     {
-                                        var thicknessOptions = new ThicknessPropertyOptions { DefaultValue = value };
+                                        var thicknessOptions = new PropertyOptions { DefaultValue = value };
                                         options = thicknessOptions;
                                     }
                                     catch (Exception ex)
                                     {
-                                        Debug.WriteLine($"Unable to extract slider info from {value}({ex.Message})");
+                                        Debug.WriteLine($"Unable to extract thickness info from {value}({ex.Message})");
+                                        TrackingManager.TrackException(ex);
+                                        continue;
+                                    }
+
+                                    break;
+
+                                case PropertyKind.Vector3:
+                                    try
+                                    {
+                                        var vector3Options = new PropertyOptions { DefaultValue = value };
+                                        options = vector3Options;
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        Debug.WriteLine($"Unable to extract vector3 info from {value}({ex.Message})");
                                         TrackingManager.TrackException(ex);
                                         continue;
                                     }

Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs

@@ -95,6 +95,10 @@ public static Vector3 ToVector3(this string text)
                             return new(x, y, z);
                         }
                     }
+                    else if (values.Length == 2)
+                    {
+                        return new(text.ToVector2(), 0);
+                    }
                 }
             }
 
@@ -140,6 +144,14 @@ public static Vector4 ToVector4(this string text)
                             return new(x, y, z, w);
                         }
                     }
+                    else if (values.Length == 3)
+                    {
+                        return new(text.ToVector3(), 0);
+                    }
+                    else if (values.Length == 2)
+                    {
+                        return new(text.ToVector2(), 0, 0);
+                    }
                 }
             }