threading fixes

Hyperbar.Windows/Templates/DataTemplateConverter.cs

@@ -0,0 +1,11 @@
+using Microsoft.UI.Xaml.Controls;
+
+namespace Hyperbar.Windows;
+
+public class DataTemplateConverter : ValueConverter<object, DataTemplateSelector> 
+{
+    protected override DataTemplateSelector? ConvertTo(object value, Type? targetType, object? parameter, string? language)
+    {
+        return new TemplateGenerator();
+    }
+}

Hyperbar.Windows/Templates/ITemplateGeneratorFactory.cs

@@ -1,9 +0,0 @@
-using Microsoft.UI.Xaml;
-
-namespace Hyperbar.Windows
-{
-    public interface ITemplateGeneratorFactory
-    {
-        DataTemplate Create();
-    }
-}

Hyperbar.Windows/Templates/TemplateFactory.cs

@@ -1,19 +1,11 @@
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 
 namespace Hyperbar.Windows;
 
-public class TemplateFactory(ITemplateGeneratorFactory factory,
-    IEnumerable<IContentTemplateDescriptor> descriptors,
+public class TemplateFactory(IEnumerable<IContentTemplateDescriptor> descriptors,
     IServiceProvider provider) :
-    DataTemplateSelector,
     ITemplateFactory
 {
-    protected override DataTemplate SelectTemplateCore(object item) => factory.Create();
-
-    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container) => factory.Create();
-
     public object? Create(object key)
     {
         if (descriptors.FirstOrDefault(x => x.Key == key) is IContentTemplateDescriptor descriptor)

Hyperbar.Windows/Templates/TemplateGenerator.cs

@@ -0,0 +1,30 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Markup;
+
+namespace Hyperbar.Windows;
+
+public class TemplateGenerator : DataTemplateSelector
+{
+    protected override DataTemplate SelectTemplateCore(object item)
+    {
+        string xamlString = @"
+                <DataTemplate xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'
+                                xmlns:desktop='using:Hyperbar.Windows'>
+                    <desktop:TemplateGeneratorControl />
+                </DataTemplate>";
+
+        return (DataTemplate)XamlReader.Load(xamlString);
+    }
+
+    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+    {
+        string xamlString = @"
+                <DataTemplate xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'
+                                xmlns:desktop='using:Hyperbar.Windows'>
+                    <desktop:TemplateGeneratorControl />
+                </DataTemplate>";
+
+        return (DataTemplate)XamlReader.Load(xamlString);
+    }
+}

Hyperbar.Windows/Templates/TemplateGeneratorFactory.cs

@@ -1,19 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Markup;
-
-namespace Hyperbar.Windows;
-
-public class TemplateGeneratorFactory :
-    ITemplateGeneratorFactory
-{
-    public DataTemplate Create()
-    {
-        string xamlString = @"
-                <DataTemplate xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'
-                                xmlns:desktop='using:Hyperbar.Windows'>
-                    <desktop:TemplateGeneratorControl />
-                </DataTemplate>";
-
-        return (DataTemplate)XamlReader.Load(xamlString);
-    }
-}

Hyperbar.Windows/Templates/ValueConverter.cs

@@ -0,0 +1,45 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Markup;
+
+namespace Hyperbar.Windows;
+
+public abstract class ValueConverter<TSource, TTarget> :
+    MarkupExtension,
+    IValueConverter
+{
+    protected override object ProvideValue(IXamlServiceProvider serviceProvider)
+    {
+        return this;
+    }
+
+    public object? Convert(object value, Type targetType, object parameter, string language)
+    {
+        return ConvertTo((TSource)value, targetType, parameter, language);
+    }
+
+    public object? ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        return ConvertBackTo((TTarget)value, targetType, parameter, language);
+    }
+
+    public TTarget? Convert(TSource value)
+    {
+        return ConvertTo(value, null, null, null);
+    }
+
+    public TSource? ConvertBack(TTarget value)
+    {
+        return ConvertBackTo(value, null, null, null);
+    }
+
+    protected virtual TTarget? ConvertTo(TSource value, Type? targetType, object? parameter, string? language)
+    {
+        return default;
+    }
+
+    protected virtual TSource? ConvertBackTo(TTarget value, Type? targetType, object? parameter, string? language)
+    {
+        return default;
+    }
+}