Fix theming for plugins

Author: Jimmacle

Torch.Server/Themes/Dark Theme Animated.xaml

@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Torch.Server.Themes">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />

Torch.Server/Themes/Dark Theme.xaml

@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Torch.Server.Themes">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ResourceDictionary.MergedDictionaries>
         <!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->

Torch.Server/Themes/Light Theme Animated.xaml

@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Torch.Server.Themes">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
 
     <ResourceDictionary.MergedDictionaries>

Torch.Server/Themes/Light Theme.xaml

@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Torch.Server.Themes">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ResourceDictionary.MergedDictionaries>
         <!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->

Torch.Server/ViewModels/PluginViewModel.cs

@@ -3,9 +3,11 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Controls;
 using Torch.API;
 using Torch.API.Plugins;
+using Torch.Server.Views;
 
 namespace Torch.Server.ViewModels
 {
@@ -23,6 +25,15 @@ public PluginViewModel(ITorchPlugin plugin)
                 Control = p.GetControl();
 
             Name = $"{plugin.Name} ({plugin.Version})";
+
+            ThemeControl.UpdateDynamicControls += UpdateResourceDict;
+            UpdateResourceDict(ThemeControl.currentTheme);
+        }
+
+        public void UpdateResourceDict(ResourceDictionary dictionary)
+        {
+            this.Control.Resources.MergedDictionaries.Clear();
+            this.Control.Resources.MergedDictionaries.Add(dictionary);
         }
     }
 }

Torch.Server/Views/Entities/Blocks/BlockView.xaml.cs

@@ -29,7 +29,7 @@ public BlockView()
         {
             InitializeComponent();
 
-            ThemeControl.UpdateWeirdViews += UpdateResourceDict;
+            ThemeControl.UpdateDynamicControls += UpdateResourceDict;
             UpdateResourceDict(ThemeControl.currentTheme);
         }
 

Torch.Server/Views/Entities/Blocks/PropertyView.xaml.cs

@@ -27,7 +27,7 @@ public PropertyView()
             InitializeComponent();
             DataContextChanged += OnDataContextChanged;
 
-            ThemeControl.UpdateWeirdViews += UpdateResourceDict;
+            ThemeControl.UpdateDynamicControls += UpdateResourceDict;
             UpdateResourceDict(ThemeControl.currentTheme);
         }
 

Torch.Server/Views/Entities/CharacterView.xaml.cs

@@ -24,7 +24,7 @@ public CharacterView()
         {
             InitializeComponent();
 
-            ThemeControl.UpdateWeirdViews += UpdateResourceDict;
+            ThemeControl.UpdateDynamicControls += UpdateResourceDict;
             UpdateResourceDict(ThemeControl.currentTheme);
         }
 

Torch.Server/Views/Entities/EntityControlHost.xaml.cs

@@ -18,7 +18,7 @@ public EntityControlHost()
             InitializeComponent();
             DataContextChanged += OnDataContextChanged;
 
-            ThemeControl.UpdateWeirdViews += UpdateResourceDict;
+            ThemeControl.UpdateDynamicControls += UpdateResourceDict;
             UpdateResourceDict(ThemeControl.currentTheme);
         }
 

Torch.Server/Views/Entities/EntityControlsView.xaml.cs

@@ -12,7 +12,7 @@ public EntityControlsView()
         {
             InitializeComponent();
 
-            ThemeControl.UpdateWeirdViews += UpdateResourceDict;
+            ThemeControl.UpdateDynamicControls += UpdateResourceDict;
             UpdateResourceDict(ThemeControl.currentTheme);
         }