From d86c5da7a9fdd107b74b4a265ead1d3c2b04c2b1 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Sun, 7 Jan 2024 13:18:38 +0000
Subject: [PATCH] fixed fetching configuration from root

---
 .../PrimaryWidgetConfiguration.cs                   |  2 +-
 .../WidgetComponentMappinglFactory.cs               | 13 +++++++++----
 .../Lifecycles/IServiceCollectionExtensions.cs      |  7 +------
 Hyperbar.Windows/Views/WidgetButtonView.xaml        |  5 ++++-
 Hyperbar/Extensions/IServiceCollectionExtensions.cs |  5 +++--
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Hyperbar.Windows.Primary/PrimaryWidgetConfiguration.cs b/Hyperbar.Windows.Primary/PrimaryWidgetConfiguration.cs
index 59057c6..1017ca5 100644
--- a/Hyperbar.Windows.Primary/PrimaryWidgetConfiguration.cs
+++ b/Hyperbar.Windows.Primary/PrimaryWidgetConfiguration.cs
@@ -5,6 +5,6 @@ public class PrimaryWidgetConfiguration :
 {
     public static PrimaryWidgetConfiguration Defaults => new()
     {
-        new KeyAcceleratorCommandConfiguration { Icon = "Test", Key = "Test", Modifiers = ["Test", "Test"] }
+        new KeyAcceleratorCommandConfiguration { Icon = "\uE720", Key = "Test", Modifiers = ["Test", "Test"] }
     };
 }
\ No newline at end of file
diff --git a/Hyperbar.Windows.Primary/WidgetComponentMappinglFactory.cs b/Hyperbar.Windows.Primary/WidgetComponentMappinglFactory.cs
index fc91b99..033561f 100644
--- a/Hyperbar.Windows.Primary/WidgetComponentMappinglFactory.cs
+++ b/Hyperbar.Windows.Primary/WidgetComponentMappinglFactory.cs
@@ -5,21 +5,26 @@ public class WidgetComponentMappingFactory :
 {
     private readonly PrimaryWidgetConfiguration configuration;
     private readonly IServiceFactory service;
+    private readonly IMediator mediator;
 
     public WidgetComponentMappingFactory(PrimaryWidgetConfiguration configuration, 
-        IServiceFactory service)
+        IServiceFactory service,
+        IMediator mediator)
     {
         this.configuration = configuration;
         this.service = service;
+        this.mediator = mediator;
     }
 
     public IEnumerable<IWidgetComponentViewModel> Create()
     {
         foreach (IPrimaryCommandConfiguration item in configuration)
         {
-            
+            if (item is KeyAcceleratorCommandConfiguration keyAcceleratorCommand)
+            {
+                yield return service.Create<WidgetButtonViewModel>(keyAcceleratorCommand.Icon, new Action(() => 
+                    mediator.Send(new KeyAcceleratorCommand(VirtualKey.LeftWindows))));
+            }
         }
-
-        return Enumerable.Empty<IWidgetComponentViewModel>();
     }
 }
diff --git a/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs b/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs
index 859cb6c..409154a 100644
--- a/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs
+++ b/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs
@@ -1,10 +1,8 @@
 using Hyperbar.Extensions;
 using Hyperbar.Windows.Interop;
-using Hyperbar.Windows.Primary;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
 
 namespace Hyperbar.Windows
 {
@@ -45,11 +43,8 @@ namespace Hyperbar.Windows
                     builder.Create(context, isolatedServices);
                 }).Build();
 
-
             services.AddTransient<IWidgetContext>(provider => new WidgetContext(host.Services));
-            host.Start();
-
-            var d = host.Services.GetService<IOptionsMonitor<PrimaryWidgetConfiguration>>();
+            services.AddTransient(provider => host);
 
             return services;
         }
diff --git a/Hyperbar.Windows/Views/WidgetButtonView.xaml b/Hyperbar.Windows/Views/WidgetButtonView.xaml
index b1651a1..3f631f6 100644
--- a/Hyperbar.Windows/Views/WidgetButtonView.xaml
+++ b/Hyperbar.Windows/Views/WidgetButtonView.xaml
@@ -9,12 +9,15 @@
         <SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="Transparent" />
         <SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="Transparent" />
         <SolidColorBrush x:Key="ButtonBorderBrushDisabled" Color="Transparent" />
+        <Thickness x:Key="ButtonPadding">0</Thickness>
         <x:Double x:Key="ButtonWidth">32</x:Double>
         <x:Double x:Key="ButtonHeight">32</x:Double>
     </UserControl.Resources>
     <Button
         Width="{StaticResource ButtonWidth}"
         Height="{StaticResource ButtonHeight}"
+        Padding="0"
         Command="{Binding Click}"
-        Content="{Binding Icon}" />
+        Content="{Binding Icon}"
+        FontFamily="{StaticResource SymbolThemeFontFamily}" />
 </UserControl>
\ No newline at end of file
diff --git a/Hyperbar/Extensions/IServiceCollectionExtensions.cs b/Hyperbar/Extensions/IServiceCollectionExtensions.cs
index 4e308b5..7c352b2 100644
--- a/Hyperbar/Extensions/IServiceCollectionExtensions.cs
+++ b/Hyperbar/Extensions/IServiceCollectionExtensions.cs
@@ -106,8 +106,9 @@ public static class IServiceCollectionExtensions
     {
         services.Configure<TConfiguration>(configuration);
         services.AddSingleton<IConfigureOptions<TConfiguration>>(new ConfigureNamedOptions<TConfiguration>("", args => { }));
-        services.AddTransient(provider => provider.GetService<IOptionsMonitor<TConfiguration>>()!.CurrentValue);
-
+        services.AddTransient(provider => {
+            
+            return provider.GetService<IOptionsMonitor<TConfiguration>>()!.CurrentValue; });
 
         services.AddSingleton<IConfigurationWriter<TConfiguration>>(provider =>
         {