Removed ThemeManagerFactory and use dependency injection for ThemeManager instead.

neumatho · neumatho · commit c8e2189fe9e1 · 2026-03-28T17:44:41.000+01:00
diff --git a/Source/Clients/NostalgicPlayer/Composition/CompositionRoot.cs b/Source/Clients/NostalgicPlayer/Composition/CompositionRoot.cs
@@ -8,6 +8,7 @@
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Services;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.AudiusWindow;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.MainWindow;
+using Polycode.NostalgicPlayer.Controls.Composition;
 using Polycode.NostalgicPlayer.External.Composition;
 using Polycode.NostalgicPlayer.Library.Application;
 using Polycode.NostalgicPlayer.Logic.Composition;
@@ -31,6 +32,7 @@ public static void Register(Container container)
 			container.RegisterLogic();
 			container.RegisterExternal();
 			container.RegisterPlatform();
+			container.RegisterControls();
 
 			RegisterSettings(container);
 			RegisterFactories(container);
diff --git a/Source/Clients/NostalgicPlayer/Services/ControlInitializerService.cs b/Source/Clients/NostalgicPlayer/Services/ControlInitializerService.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
-using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows;
+using Polycode.NostalgicPlayer.Controls;
 using Polycode.NostalgicPlayer.Kit.Utility.Interfaces;
 
 namespace Polycode.NostalgicPlayer.Client.GuiPlayer.Services
diff --git a/Source/Clients/NostalgicPlayer/Services/FormCreatorService.cs b/Source/Clients/NostalgicPlayer/Services/FormCreatorService.cs
@@ -3,9 +3,12 @@
 /* license of NostalgicPlayer is keep. See the LICENSE file for more          */
 /* information.                                                               */
 /******************************************************************************/
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
+using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows;
+using Polycode.NostalgicPlayer.Controls;
 using Polycode.NostalgicPlayer.Kit.Utility.Interfaces;
 
 namespace Polycode.NostalgicPlayer.Client.GuiPlayer.Services
@@ -41,6 +44,7 @@ public FormCreatorService(IApplicationContext applicationContext, IControlInitia
 		{
 			T form = new T();
 
+			CallComponentInitializeMethod(form);
 			controlInitializerService.InitializeControls(form.Controls);
 
 			CallInitializeMethod(form, "InitializeBaseForm");
@@ -50,6 +54,41 @@ public FormCreatorService(IApplicationContext applicationContext, IControlInitia
 		}
 
 		#region Private methods
+		/********************************************************************/
+		/// <summary>
+		/// Check to see if the form has a component collection. If so,
+		/// call initialize on them
+		/// </summary>
+		/********************************************************************/
+		private void CallComponentInitializeMethod(Form form)
+		{
+			FieldInfo field = form.GetType().GetField("components", BindingFlags.NonPublic | BindingFlags.Instance);
+
+			if (field != null)
+			{
+				if (field.GetValue(form) is IContainer container)
+				{
+					foreach (Component component in container.Components)
+					{
+						if (component is IDependencyInjectionControl diComponent)
+						{
+							MethodInfo initializeMethod = diComponent.GetType().GetMethod("InitializeComponent", BindingFlags.Public | BindingFlags.Instance);
+
+							if (initializeMethod != null)
+							{
+								ParameterInfo[] parameters = initializeMethod.GetParameters();
+								object[] arguments = parameters.Select(p => applicationContext.Container.GetInstance(p.ParameterType)).ToArray();
+
+								initializeMethod.Invoke(diComponent, arguments);
+							}
+						}
+					}
+				}
+			}
+		}
+
+
+
 		/********************************************************************/
 		/// <summary>
 		/// Try to find the given method and call it
diff --git a/Source/Clients/NostalgicPlayer/Windows/AudiusWindow/AudiusListControl.cs b/Source/Clients/NostalgicPlayer/Windows/AudiusWindow/AudiusListControl.cs
@@ -14,6 +14,7 @@
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.AudiusWindow.Events;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.AudiusWindow.ListItems;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.MainWindow;
+using Polycode.NostalgicPlayer.Controls;
 using Polycode.NostalgicPlayer.External.Download;
 
 namespace Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.AudiusWindow
diff --git a/Source/Clients/NostalgicPlayer/Windows/AudiusWindow/Pages/ProfilePlaylistsPageControl.cs b/Source/Clients/NostalgicPlayer/Windows/AudiusWindow/Pages/ProfilePlaylistsPageControl.cs
@@ -8,6 +8,7 @@
 using System.Windows.Forms;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Controls;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.AudiusWindow.ListItems;
+using Polycode.NostalgicPlayer.Controls;
 using Polycode.NostalgicPlayer.External;
 using Polycode.NostalgicPlayer.External.Audius;
 using Polycode.NostalgicPlayer.External.Audius.Interfaces;
diff --git a/Source/Clients/NostalgicPlayer/Windows/AudiusWindow/Pages/ProfileTracksPageControl.cs b/Source/Clients/NostalgicPlayer/Windows/AudiusWindow/Pages/ProfileTracksPageControl.cs
@@ -9,6 +9,7 @@
 using System.Windows.Forms;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Controls;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.AudiusWindow.ListItems;
+using Polycode.NostalgicPlayer.Controls;
 using Polycode.NostalgicPlayer.External;
 using Polycode.NostalgicPlayer.External.Audius;
 using Polycode.NostalgicPlayer.External.Audius.Interfaces;
diff --git a/Source/Clients/NostalgicPlayer/Windows/AudiusWindow/Pages/SearchPageControl.cs b/Source/Clients/NostalgicPlayer/Windows/AudiusWindow/Pages/SearchPageControl.cs
@@ -12,6 +12,7 @@
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Services;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.AudiusWindow.Events;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.AudiusWindow.ListItems;
+using Polycode.NostalgicPlayer.Controls;
 using Polycode.NostalgicPlayer.External;
 using Polycode.NostalgicPlayer.External.Audius;
 using Polycode.NostalgicPlayer.External.Audius.Interfaces;
diff --git a/Source/Clients/NostalgicPlayer/Windows/AudiusWindow/Pages/TrendingPageControl.cs b/Source/Clients/NostalgicPlayer/Windows/AudiusWindow/Pages/TrendingPageControl.cs
@@ -11,6 +11,7 @@
 using Krypton.Toolkit;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Controls;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.AudiusWindow.ListItems;
+using Polycode.NostalgicPlayer.Controls;
 using Polycode.NostalgicPlayer.External;
 using Polycode.NostalgicPlayer.External.Audius;
 using Polycode.NostalgicPlayer.External.Audius.Interfaces;
diff --git a/Source/Clients/NostalgicPlayer/Windows/SettingsWindow/Pages/AgentsListUserControl.cs b/Source/Clients/NostalgicPlayer/Windows/SettingsWindow/Pages/AgentsListUserControl.cs
@@ -13,6 +13,7 @@
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Containers.Settings;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Services;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.MainWindow;
+using Polycode.NostalgicPlayer.Controls;
 using Polycode.NostalgicPlayer.Kit.Containers;
 using Polycode.NostalgicPlayer.Kit.Gui.Components;
 using Polycode.NostalgicPlayer.Kit.Gui.Extensions;
diff --git a/Source/Clients/NostalgicPlayer/Windows/SettingsWindow/Pages/AgentsPageControl.cs b/Source/Clients/NostalgicPlayer/Windows/SettingsWindow/Pages/AgentsPageControl.cs
@@ -9,6 +9,7 @@
 using Krypton.Navigator;
 using Krypton.Toolkit;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Containers.Settings;
+using Polycode.NostalgicPlayer.Controls;
 using Polycode.NostalgicPlayer.Kit.Utility.Interfaces;
 
 namespace Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.SettingsWindow.Pages
diff --git a/Source/Clients/NostalgicPlayer/Windows/SettingsWindow/Pages/MixerPageControl.cs b/Source/Clients/NostalgicPlayer/Windows/SettingsWindow/Pages/MixerPageControl.cs
@@ -11,6 +11,7 @@
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Factories;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Services;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.MainWindow;
+using Polycode.NostalgicPlayer.Controls;
 using Polycode.NostalgicPlayer.Kit.Containers;
 using Polycode.NostalgicPlayer.Kit.Utility.Interfaces;
 using Polycode.NostalgicPlayer.Library.Agent;
diff --git a/Source/Clients/NostalgicPlayer/Windows/SettingsWindow/Pages/ModulesPageControl.cs b/Source/Clients/NostalgicPlayer/Windows/SettingsWindow/Pages/ModulesPageControl.cs
@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Containers.Settings;
+using Polycode.NostalgicPlayer.Controls;
 using Polycode.NostalgicPlayer.Kit.Utility.Interfaces;
 
 namespace Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.SettingsWindow.Pages
diff --git a/Source/Clients/NostalgicPlayer/Windows/SettingsWindow/Pages/OptionsPageControl.cs b/Source/Clients/NostalgicPlayer/Windows/SettingsWindow/Pages/OptionsPageControl.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Windows.Forms;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Containers.Settings;
+using Polycode.NostalgicPlayer.Controls;
 using Polycode.NostalgicPlayer.Kit.Utility.Interfaces;
 
 namespace Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.SettingsWindow.Pages
diff --git a/Source/Clients/NostalgicPlayer/Windows/SettingsWindow/Pages/PathsPageControl.cs b/Source/Clients/NostalgicPlayer/Windows/SettingsWindow/Pages/PathsPageControl.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Windows.Forms;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Containers.Settings;
+using Polycode.NostalgicPlayer.Controls;
 using Polycode.NostalgicPlayer.Kit.Utility.Interfaces;
 
 namespace Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.SettingsWindow.Pages
diff --git a/Source/Clients/NostalgicPlayer/Windows/WindowFormBase2.cs b/Source/Clients/NostalgicPlayer/Windows/WindowFormBase2.cs
@@ -8,7 +8,7 @@
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Containers.Settings;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.MainWindow;
 using Polycode.NostalgicPlayer.Controls.Forms;
-using Polycode.NostalgicPlayer.Controls.Theme;
+using Polycode.NostalgicPlayer.Controls.Theme.Interfaces;
 using Polycode.NostalgicPlayer.Controls.Theme.Purple;
 using Polycode.NostalgicPlayer.Controls.Theme.Standard;
 using Polycode.NostalgicPlayer.Kit.Utility.Interfaces;
@@ -37,6 +37,7 @@ public class WindowFormBase2 : NostalgicForm, IWindowForm
 		private IMainWindowApi mainWindowApi;
 
 		private WindowSettings windowSettings;
+		private IThemeManager themeManager;
 
 		/********************************************************************/
 		/// <summary>
@@ -45,11 +46,14 @@ public class WindowFormBase2 : NostalgicForm, IWindowForm
 		/// Called from FormCreatorService
 		/// </summary>
 		/********************************************************************/
-		public void InitializeBaseForm(IMainWindowApi mainWindowApi, ISettings settings, OptionSettings optionSettings)
+		public void InitializeBaseForm(IMainWindowApi mainWindowApi, ISettings settings, OptionSettings optionSettings, IThemeManager themeManager)
 		{
+			InitializeNostalgicForm(themeManager);
+
 			// Remember the arguments
 			this.mainWindowApi = mainWindowApi;
 			allWindowSettings = settings;
+			this.themeManager = themeManager;
 
 			// Set how the window should act in the task bar and task switcher.
 			// Only apply to child windows - the main window (where mainWindowApi.Form
@@ -199,7 +203,7 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
 					case Keys.F12:
 					{
 						theme = !theme;
-						ThemeManagerFactory.GetThemeManager().SwitchTheme(theme ? new PurpleTheme() : new StandardTheme());
+						themeManager.SwitchTheme(theme ? new PurpleTheme() : new StandardTheme());
 
 						return true;
 					}
diff --git a/Source/NostalgicPlayer.Controls/Buttons/NostalgicButton.cs b/Source/NostalgicPlayer.Controls/Buttons/NostalgicButton.cs
@@ -10,8 +10,8 @@
 using System.Windows.Forms;
 using Polycode.NostalgicPlayer.Controls.Components;
 using Polycode.NostalgicPlayer.Controls.Designer;
-using Polycode.NostalgicPlayer.Controls.Theme;
 using Polycode.NostalgicPlayer.Controls.Theme.Interfaces;
+using Polycode.NostalgicPlayer.Controls.Theme.Standard;
 
 namespace Polycode.NostalgicPlayer.Controls.Buttons
 {
@@ -81,7 +81,7 @@ public FontConfiguration UseFont
 		protected override void OnHandleCreated(EventArgs e)
 		{
 			if (DesignMode)
-				SetTheme(ThemeManagerFactory.GetThemeManager().CurrentTheme);
+				SetTheme(new StandardTheme());
 
 			base.OnHandleCreated(e);
 		}
diff --git a/Source/NostalgicPlayer.Controls/Components/FontConfiguration.cs b/Source/NostalgicPlayer.Controls/Components/FontConfiguration.cs
@@ -6,7 +6,6 @@
 using System;
 using System.ComponentModel;
 using System.Drawing;
-using Polycode.NostalgicPlayer.Controls.Theme;
 using Polycode.NostalgicPlayer.Controls.Theme.Interfaces;
 
 namespace Polycode.NostalgicPlayer.Controls.Components
@@ -16,8 +15,10 @@ namespace Polycode.NostalgicPlayer.Controls.Components
 	/// standard font size and/or style
 	/// </summary>
 	[ToolboxItem(true)]
-	public partial class FontConfiguration : Component
+	public partial class FontConfiguration : Component, IDependencyInjectionControl
 	{
+		private IThemeManager themeManager;
+
 		private FontType fontType = FontType.Regular;
 		private FontStyle fontStyle = FontStyle.Regular;
 		private int relativeFontSize = 0;
@@ -48,6 +49,22 @@ public FontConfiguration(IContainer container) : this()
 			container.Add(this);
 		}
 
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Initialize the control
+		///
+		/// Called from FormCreatorService
+		/// </summary>
+		/********************************************************************/
+		public void InitializeComponent(IThemeManager themeManager)
+		{
+			this.themeManager = themeManager;
+
+			DefineFont();
+		}
+
 		#region Properties
 		/********************************************************************/
 		/// <summary>
@@ -156,20 +173,21 @@ private void FontConfiguration_Disposed(object sender, EventArgs e)
 		/********************************************************************/
 		private void DefineFont()
 		{
-			font?.Dispose();
-			font = null;
+			if (themeManager != null)
+			{
+				font?.Dispose();
+				font = null;
 
-			IThemeManager themeManager = ThemeManagerFactory.GetThemeManager();
+				if ((FontSize != 0) || (FontStyle != FontStyle.Regular) || (FontType != FontType.Regular))
+				{
+					IFonts standardFonts = themeManager.CurrentTheme.StandardFonts;
+					Font baseFont = FontType == FontType.Monospace ? standardFonts.MonospaceFont : standardFonts.RegularFont;
 
-			if ((FontSize != 0) || (FontStyle != FontStyle.Regular) || (FontType != FontType.Regular))
-			{
-				IFonts standardFonts = themeManager.CurrentTheme.StandardFonts;
-				Font baseFont = FontType == FontType.Monospace ? standardFonts.MonospaceFont : standardFonts.RegularFont;
+					font = new Font(baseFont.FontFamily, baseFont.Size + FontSize, fontStyle, GraphicsUnit.Point);
+				}
 
-				font = new Font(baseFont.FontFamily, baseFont.Size + FontSize, fontStyle, GraphicsUnit.Point);
+				themeManager.RefreshControls();
 			}
-
-			themeManager.RefreshControls();
 		}
 		#endregion
 	}
diff --git a/Source/NostalgicPlayer.Controls/Composition/CompositionRoot.cs b/Source/NostalgicPlayer.Controls/Composition/CompositionRoot.cs
@@ -3,29 +3,25 @@
 /* license of NostalgicPlayer is keep. See the LICENSE file for more          */
 /* information.                                                               */
 /******************************************************************************/
+using Polycode.NostalgicPlayer.Controls.Theme;
 using Polycode.NostalgicPlayer.Controls.Theme.Interfaces;
+using SimpleInjector;
 
-namespace Polycode.NostalgicPlayer.Controls.Theme
+namespace Polycode.NostalgicPlayer.Controls.Composition
 {
 	/// <summary>
-	/// Factory class for theme manager
+	/// Register all classes/interfaces into the dependency injection container
 	/// </summary>
-	public static class ThemeManagerFactory
+	public static class CompositionRoot
 	{
-		private static IThemeManager themeManager;
-
 		/********************************************************************/
 		/// <summary>
-		/// Create a new instance of the theme manager if not created already
-		/// and return the instance
+		/// Register all client specific classes into the container
 		/// </summary>
 		/********************************************************************/
-		public static IThemeManager GetThemeManager()
+		public static void RegisterControls(this Container container)
 		{
-			if (themeManager == null)
-				themeManager = new ThemeManager();
-
-			return themeManager;
+			container.RegisterSingleton<IThemeManager, ThemeManager>();
 		}
 	}
 }
diff --git a/Source/NostalgicPlayer.Controls/Containers/NostalgicBox.cs b/Source/NostalgicPlayer.Controls/Containers/NostalgicBox.cs
@@ -8,8 +8,8 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using Polycode.NostalgicPlayer.Controls.Native;
-using Polycode.NostalgicPlayer.Controls.Theme;
 using Polycode.NostalgicPlayer.Controls.Theme.Interfaces;
+using Polycode.NostalgicPlayer.Controls.Theme.Standard;
 
 namespace Polycode.NostalgicPlayer.Controls.Containers
 {
@@ -41,7 +41,7 @@ public NostalgicBox()
 		protected override void OnHandleCreated(EventArgs e)
 		{
 			if (DesignMode)
-				SetTheme(ThemeManagerFactory.GetThemeManager().CurrentTheme);
+				SetTheme(new StandardTheme());
 
 			base.OnHandleCreated(e);
 		}
@@ -137,7 +137,7 @@ private void RecalculateClientArea(Message m)
 		/********************************************************************/
 		private void DrawCustomNonClient()
 		{
-			if (!IsHandleCreated)
+			if (!IsHandleCreated || (colors == null))
 				return;
 
 			// Draw border in non-client area
diff --git a/Source/NostalgicPlayer.Controls/Forms/NostalgicForm.cs b/Source/NostalgicPlayer.Controls/Forms/NostalgicForm.cs
diff --git a/Source/NostalgicPlayer.Controls/IDependencyInjectionControl.cs b/Source/NostalgicPlayer.Controls/IDependencyInjectionControl.cs
diff --git a/Source/NostalgicPlayer.Controls/Lists/NostalgicComboBox.cs b/Source/NostalgicPlayer.Controls/Lists/NostalgicComboBox.cs
diff --git a/Source/NostalgicPlayer.Controls/Lists/NostalgicDataGridViewInternal.cs b/Source/NostalgicPlayer.Controls/Lists/NostalgicDataGridViewInternal.cs
diff --git a/Source/NostalgicPlayer.Controls/Lists/NostalgicScrollBar.cs b/Source/NostalgicPlayer.Controls/Lists/NostalgicScrollBar.cs
diff --git a/Source/NostalgicPlayer.Controls/NostalgicPlayer.Controls.csproj b/Source/NostalgicPlayer.Controls/NostalgicPlayer.Controls.csproj
