From d75aef7460de4aa2015e0789b7edf9e27dabaa3d Mon Sep 17 00:00:00 2001
From: Stone-Red-Code <56473591+Stone-Red-Code@users.noreply.github.com>
Date: Tue, 26 Oct 2021 18:40:45 +0200
Subject: [PATCH] - Code Cleanup

---
 src/DesktopMagic/MainWindow.xaml    |  6 +--
 src/DesktopMagic/MainWindow.xaml.cs | 74 +++++++++++++----------------
 2 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/src/DesktopMagic/MainWindow.xaml b/src/DesktopMagic/MainWindow.xaml
index aa9389e..5b7bb31 100644
--- a/src/DesktopMagic/MainWindow.xaml
+++ b/src/DesktopMagic/MainWindow.xaml
@@ -94,19 +94,19 @@
                         <Border CornerRadius="1" BorderThickness="1.5" BorderBrush="Gray" Height="23" Width="23"  Margin="0,0,5,0">
                             <Rectangle x:Name="primaryColorRechtangle" Fill="White" />
                         </Border>
-                        <Button Content="Change Primary Color" Height="23" FontSize="10" Click="ChangePrimaryColorButton_Click"   />
+                        <Button Content="Change Primary Color" Height="23" FontSize="12" FontWeight="Regular" Click="ChangePrimaryColorButton_Click"/>
                     </DockPanel>
                     <DockPanel Margin="0,0,0,5">
                         <Border CornerRadius="1" BorderThickness="1.5" BorderBrush="Gray" Height="23" Width="23"  Margin="0,0,5,0">
                             <Rectangle x:Name="secondaryColorRechtangle" Fill="White" />
                         </Border>
-                        <Button Content="Change Secondary Color" Height="23" FontSize="10" Click="ChangeSecondaryColorButton_Click" />
+                        <Button Content="Change Secondary Color" Height="23" FontSize="12" FontWeight="Regular" Click="ChangeSecondaryColorButton_Click" />
                     </DockPanel>
                     <DockPanel >
                         <Border CornerRadius="1" BorderThickness="1.5" BorderBrush="Gray" Height="23" Width="23"  Margin="0,0,5,0">
                             <Rectangle x:Name="backgroundColorRechtangle" Fill="White" />
                         </Border>
-                        <Button Content="Change Background Color" Height="23" FontSize="10" Click="ChangeBackgroundColorButton_Click" />
+                        <Button Content="Change Background Color" Height="23" FontSize="12" FontWeight="Regular" Click="ChangeBackgroundColorButton_Click" />
                     </DockPanel>
                 </StackPanel>
                 <Grid Grid.Row="1" VerticalAlignment="Bottom">
diff --git a/src/DesktopMagic/MainWindow.xaml.cs b/src/DesktopMagic/MainWindow.xaml.cs
index 7309f75..b4947eb 100644
--- a/src/DesktopMagic/MainWindow.xaml.cs
+++ b/src/DesktopMagic/MainWindow.xaml.cs
@@ -362,52 +362,42 @@ namespace DesktopMagic
         {
             if (!string.IsNullOrWhiteSpace(musicVisualizerColorTextBox.Text) && musicVisualizerColorTextBox.Text != "Default")
             {
-                try
+                if (musicVisualizerColorTextBox.Text.Length > 0)
                 {
-                    if (musicVisualizerColorTextBox.Text.Length > 0)
+                    if (musicVisualizerColorTextBox.Text.ToCharArray()[0] != '#')
                     {
-                        if (musicVisualizerColorTextBox.Text.ToCharArray()[0] != '#')
-                        {
-                            musicVisualizerColorTextBox.Text = "#" + musicVisualizerColorTextBox.Text.Replace("#", "");
-                        }
-                    }
-                    else
-                    {
-                        musicVisualizerColorTextBox.Text = "#";
-                        musicVisualizerColorTextBox.Select(musicVisualizerColorTextBox.Text.Length, 0);
-                    }
-
-                    if (musicVisualizerColorTextBox.SelectionStart == 0)
-                    {
-                        if (musicVisualizerColorTextBox.Text.Length <= 2)
-                        {
-                            musicVisualizerColorTextBox.Select(musicVisualizerColorTextBox.Text.Length, 0);
-                        }
-                        else
-                        {
-                            musicVisualizerColorTextBox.Select(1, 0);
-                        }
-                    }
-
-                    string hex = musicVisualizerColorTextBox.Text;
-                    hex = hex.Replace("#", "");
-
-                    if (hex.Length == 6)
-                    {
-                        System.Drawing.Color systemColor = System.Drawing.Color.FromArgb((byte)int.Parse(hex.Substring(0, 2), System.Globalization.NumberStyles.HexNumber), (byte)int.Parse(hex.Substring(2, 2), System.Globalization.NumberStyles.HexNumber), (byte)int.Parse(hex.Substring(4, 2), System.Globalization.NumberStyles.HexNumber));
-
-                        MusicVisualzerColor = systemColor;
-                        musicVisualizerColorTextBox.Foreground = Brushes.Black;
-
-                        key.SetValue("MusicVisualizerColor", musicVisualizerColorTextBox.Text);
-                        SaveLayout();
-                    }
-                    else
-                    {
-                        musicVisualizerColorTextBox.Foreground = Brushes.Red;
+                        musicVisualizerColorTextBox.Text = "#" + musicVisualizerColorTextBox.Text.Replace("#", "");
                     }
                 }
-                catch
+                else
+                {
+                    musicVisualizerColorTextBox.Text = "#";
+                    musicVisualizerColorTextBox.Select(musicVisualizerColorTextBox.Text.Length, 0);
+                }
+
+                if (musicVisualizerColorTextBox.SelectionStart == 0)
+                {
+                    if (musicVisualizerColorTextBox.Text.Length <= 2)
+                    {
+                        musicVisualizerColorTextBox.Select(musicVisualizerColorTextBox.Text.Length, 0);
+                    }
+                    else
+                    {
+                        musicVisualizerColorTextBox.Select(1, 0);
+                    }
+                }
+
+                string hex = musicVisualizerColorTextBox.Text;
+
+                if (MultiColorConverter.TryConvertToSystemColor(hex, out System.Drawing.Color systemColor))
+                {
+                    MusicVisualzerColor = systemColor;
+                    musicVisualizerColorTextBox.Foreground = Brushes.Black;
+
+                    key.SetValue("MusicVisualizerColor", musicVisualizerColorTextBox.Text);
+                    SaveLayout();
+                }
+                else
                 {
                     musicVisualizerColorTextBox.Foreground = Brushes.Red;
                 }