From 943acd78e85e01602611db3cf2080af6c32f9199 Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Sat, 17 Aug 2024 12:53:02 +0100
Subject: [PATCH] FIx inconsistent WPF theming (#2621)

---
 Bloxstrap/LaunchHandler.cs                                 | 1 -
 Bloxstrap/UI/Elements/Base/WpfUiWindow.cs                  | 7 ++++++-
 .../UI/Elements/Bootstrapper/ClassicFluentDialog.xaml.cs   | 1 -
 Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml.cs    | 1 -
 Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml.cs    | 1 -
 Bloxstrap/UI/Elements/ContextMenu/ServerInformation.xaml   | 5 +++--
 Bloxstrap/UI/Elements/Dialogs/AddFastFlagDialog.xaml       | 5 +++--
 Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml        | 5 +++--
 .../UI/Elements/Dialogs/LanguageSelectorDialog.xaml.cs     | 1 -
 Bloxstrap/UI/Elements/Dialogs/LaunchMenuDialog.xaml.cs     | 1 -
 Bloxstrap/UI/Elements/Dialogs/UninstallerDialog.xaml.cs    | 1 -
 Bloxstrap/UI/Elements/Installer/MainWindow.xaml.cs         | 1 -
 Bloxstrap/UI/Elements/Settings/MainWindow.xaml             | 1 -
 Bloxstrap/UI/Elements/Settings/MainWindow.xaml.cs          | 1 -
 14 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Bloxstrap/LaunchHandler.cs b/Bloxstrap/LaunchHandler.cs
index a659d8b..aead956 100644
--- a/Bloxstrap/LaunchHandler.cs
+++ b/Bloxstrap/LaunchHandler.cs
@@ -96,7 +96,6 @@ namespace Bloxstrap
                 return;
             }
 
-
             bool confirmed = false;
             bool keepData = true;
 
diff --git a/Bloxstrap/UI/Elements/Base/WpfUiWindow.cs b/Bloxstrap/UI/Elements/Base/WpfUiWindow.cs
index d941ea8..6291d03 100644
--- a/Bloxstrap/UI/Elements/Base/WpfUiWindow.cs
+++ b/Bloxstrap/UI/Elements/Base/WpfUiWindow.cs
@@ -11,10 +11,15 @@ using Wpf.Ui.Mvvm.Services;
 
 namespace Bloxstrap.UI.Elements.Base
 {
-    public class WpfUiWindow : UiWindow
+    public abstract class WpfUiWindow : UiWindow
     {
         private readonly IThemeService _themeService = new ThemeService();
 
+        public WpfUiWindow()
+        {
+            ApplyTheme();
+        }
+
         public void ApplyTheme()
         {
             _themeService.SetTheme(App.Settings.Prop.Theme.GetFinal() == Enums.Theme.Dark ? ThemeType.Dark : ThemeType.Light);
diff --git a/Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml.cs b/Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml.cs
index c32d510..5139a3c 100644
--- a/Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml.cs
+++ b/Bloxstrap/UI/Elements/Bootstrapper/ClassicFluentDialog.xaml.cs
@@ -78,7 +78,6 @@ namespace Bloxstrap.UI.Elements.Bootstrapper
         public ClassicFluentDialog()
         {
             InitializeComponent();
-            ApplyTheme();
 
             _viewModel = new ClassicFluentDialogViewModel(this);
             DataContext = _viewModel;
diff --git a/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml.cs b/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml.cs
index 0759139..9048f02 100644
--- a/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml.cs
+++ b/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml.cs
@@ -88,7 +88,6 @@ namespace Bloxstrap.UI.Elements.Bootstrapper
         public FluentDialog(bool aero)
         {
             InitializeComponent();
-            ApplyTheme();
 
             _viewModel = new FluentDialogViewModel(this, aero);
             DataContext = _viewModel;
diff --git a/Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml.cs b/Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml.cs
index aec124a..9e34a29 100644
--- a/Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml.cs
+++ b/Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml.cs
@@ -31,7 +31,6 @@ namespace Bloxstrap.UI.Elements.ContextMenu
         public MenuContainer(ActivityWatcher? activityWatcher, DiscordRichPresence? richPresenceHandler, int? processId)
         {
             InitializeComponent();
-            ApplyTheme();
 
             _activityWatcher = activityWatcher;
             _richPresenceHandler = richPresenceHandler;
diff --git a/Bloxstrap/UI/Elements/ContextMenu/ServerInformation.xaml b/Bloxstrap/UI/Elements/ContextMenu/ServerInformation.xaml
index 23c2786..381215c 100644
--- a/Bloxstrap/UI/Elements/ContextMenu/ServerInformation.xaml
+++ b/Bloxstrap/UI/Elements/ContextMenu/ServerInformation.xaml
@@ -1,9 +1,10 @@
-<ui:UiWindow x:Class="Bloxstrap.UI.Elements.ContextMenu.ServerInformation"
+<base:WpfUiWindow x:Class="Bloxstrap.UI.Elements.ContextMenu.ServerInformation"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Bloxstrap.UI.Elements.ContextMenu"
+        xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base"
         xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
         xmlns:models="clr-namespace:Bloxstrap.UI.ViewModels.ContextMenu"
         xmlns:resources="clr-namespace:Bloxstrap.Resources"
@@ -56,4 +57,4 @@
             </StackPanel>
         </Border>
     </Grid>
-</ui:UiWindow>
+</base:WpfUiWindow>
diff --git a/Bloxstrap/UI/Elements/Dialogs/AddFastFlagDialog.xaml b/Bloxstrap/UI/Elements/Dialogs/AddFastFlagDialog.xaml
index 669dc7c..f4ea9b6 100644
--- a/Bloxstrap/UI/Elements/Dialogs/AddFastFlagDialog.xaml
+++ b/Bloxstrap/UI/Elements/Dialogs/AddFastFlagDialog.xaml
@@ -1,10 +1,11 @@
-<ui:UiWindow x:Class="Bloxstrap.UI.Elements.Dialogs.AddFastFlagDialog"
+<base:WpfUiWindow x:Class="Bloxstrap.UI.Elements.Dialogs.AddFastFlagDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
         xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Dialogs"
+        xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base"
         xmlns:resources="clr-namespace:Bloxstrap.Resources"
         xmlns:converters="clr-namespace:Bloxstrap.UI.Converters"
         mc:Ignorable="d"
@@ -101,4 +102,4 @@
             </StackPanel>
         </Border>
     </Grid>
-</ui:UiWindow>
+</base:WpfUiWindow>
diff --git a/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml b/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml
index 0681ea1..cf6ec08 100644
--- a/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml
+++ b/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml
@@ -1,10 +1,11 @@
-<ui:UiWindow x:Class="Bloxstrap.UI.Elements.Dialogs.FluentMessageBox"
+<base:WpfUiWindow x:Class="Bloxstrap.UI.Elements.Dialogs.FluentMessageBox"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
         xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Dialogs"
+        xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base"
         mc:Ignorable="d"
         Title="Bloxstrap"
         d:DesignWidth="480"
@@ -43,4 +44,4 @@
             </StackPanel>
         </Border>
     </Grid>
-</ui:UiWindow>
+</base:WpfUiWindow>
diff --git a/Bloxstrap/UI/Elements/Dialogs/LanguageSelectorDialog.xaml.cs b/Bloxstrap/UI/Elements/Dialogs/LanguageSelectorDialog.xaml.cs
index 6faeeb9..1441b9e 100644
--- a/Bloxstrap/UI/Elements/Dialogs/LanguageSelectorDialog.xaml.cs
+++ b/Bloxstrap/UI/Elements/Dialogs/LanguageSelectorDialog.xaml.cs
@@ -26,7 +26,6 @@ namespace Bloxstrap.UI.Elements.Dialogs
 
             DataContext = viewModel;
             InitializeComponent();
-            ApplyTheme();
 
             viewModel.CloseRequestEvent += (_, _) => Close();
         }
diff --git a/Bloxstrap/UI/Elements/Dialogs/LaunchMenuDialog.xaml.cs b/Bloxstrap/UI/Elements/Dialogs/LaunchMenuDialog.xaml.cs
index f51898f..bb66b22 100644
--- a/Bloxstrap/UI/Elements/Dialogs/LaunchMenuDialog.xaml.cs
+++ b/Bloxstrap/UI/Elements/Dialogs/LaunchMenuDialog.xaml.cs
@@ -36,7 +36,6 @@ namespace Bloxstrap.UI.Elements.Dialogs
             DataContext = viewModel;
 
             InitializeComponent();
-            ApplyTheme();
         }
     }
 }
diff --git a/Bloxstrap/UI/Elements/Dialogs/UninstallerDialog.xaml.cs b/Bloxstrap/UI/Elements/Dialogs/UninstallerDialog.xaml.cs
index 993f124..3302f95 100644
--- a/Bloxstrap/UI/Elements/Dialogs/UninstallerDialog.xaml.cs
+++ b/Bloxstrap/UI/Elements/Dialogs/UninstallerDialog.xaml.cs
@@ -39,7 +39,6 @@ namespace Bloxstrap.UI.Elements.Dialogs
             DataContext = viewModel;
 
             InitializeComponent();
-            ApplyTheme();
         }
     }
 }
diff --git a/Bloxstrap/UI/Elements/Installer/MainWindow.xaml.cs b/Bloxstrap/UI/Elements/Installer/MainWindow.xaml.cs
index 7d3eeb8..90108be 100644
--- a/Bloxstrap/UI/Elements/Installer/MainWindow.xaml.cs
+++ b/Bloxstrap/UI/Elements/Installer/MainWindow.xaml.cs
@@ -62,7 +62,6 @@ namespace Bloxstrap.UI.Elements.Installer
 
             DataContext = _viewModel;
             InitializeComponent();
-            ApplyTheme();
 
             App.Logger.WriteLine("MainWindow::MainWindow", "Initializing installer");
 
diff --git a/Bloxstrap/UI/Elements/Settings/MainWindow.xaml b/Bloxstrap/UI/Elements/Settings/MainWindow.xaml
index 57b5ecb..49f508a 100644
--- a/Bloxstrap/UI/Elements/Settings/MainWindow.xaml
+++ b/Bloxstrap/UI/Elements/Settings/MainWindow.xaml
@@ -1,5 +1,4 @@
 <base:WpfUiWindow x:Class="Bloxstrap.UI.Elements.Settings.MainWindow"
-             x:Name="ConfigurationWindow"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/Bloxstrap/UI/Elements/Settings/MainWindow.xaml.cs b/Bloxstrap/UI/Elements/Settings/MainWindow.xaml.cs
index c4a4225..c877bae 100644
--- a/Bloxstrap/UI/Elements/Settings/MainWindow.xaml.cs
+++ b/Bloxstrap/UI/Elements/Settings/MainWindow.xaml.cs
@@ -18,7 +18,6 @@ namespace Bloxstrap.UI.Elements.Settings
             DataContext = viewModel;
             
             InitializeComponent();
-            ApplyTheme();
 
             App.Logger.WriteLine("MainWindow::MainWindow", "Initializing menu");