theme editor: some cleanup

Author: unitycoder

UnityLauncherPro/ThemeEditor.xaml.cs

@@ -31,28 +31,6 @@ public ThemeEditor()
             InitializeComponent();
         }
 
-        void UpdateColorPreview()
-        {
-            var newColor = new Color();
-            newColor.R = (byte)sliderRed.Value;
-            newColor.G = (byte)sliderGreen.Value;
-            newColor.B = (byte)sliderBlue.Value;
-            newColor.A = (byte)sliderAlpha.Value;
-            var newColorBrush = new SolidColorBrush(newColor);
-            rectSelectedColor.Fill = newColorBrush;
-
-            // set new color into our collection values
-            themeColors[themeColors.IndexOf((ThemeColor)gridThemeColors.SelectedItem)].Brush = newColorBrush;
-
-            // NOTE slow but works..
-            gridThemeColors.Items.Refresh();
-
-            // apply color changes to mainwindow
-            var item = gridThemeColors.SelectedItem as ThemeColor;
-            Application.Current.Resources[item.Key] = newColorBrush;
-            forceValue = false;
-        }
-
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             themeColors.Clear();
@@ -84,6 +62,34 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
             gridThemeColors.SelectedIndex = 0;
         }
 
+        void UpdateColorPreview()
+        {
+            var newColor = new Color();
+            newColor.R = (byte)sliderRed.Value;
+            newColor.G = (byte)sliderGreen.Value;
+            newColor.B = (byte)sliderBlue.Value;
+            newColor.A = (byte)sliderAlpha.Value;
+            var newColorBrush = new SolidColorBrush(newColor);
+            rectSelectedColor.Fill = newColorBrush;
+
+            // set new color into our collection values
+            themeColors[themeColors.IndexOf((ThemeColor)gridThemeColors.SelectedItem)].Brush = newColorBrush;
+
+            gridThemeColors.Items.Refresh();
+
+            // apply color changes to mainwindow
+            var item = gridThemeColors.SelectedItem as ThemeColor;
+            Application.Current.Resources[item.Key] = newColorBrush;
+            forceValue = false;
+        }
+
+        void SetSlider(Slider target, double color)
+        {
+            forceValue = true;
+            target.Value = color;
+            forceValue = false;
+        }
+
         private void GridThemeColors_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (gridThemeColors.SelectedIndex == -1) return;
@@ -95,15 +101,10 @@ private void GridThemeColors_SelectionChanged(object sender, SelectionChangedEve
             rectSelectedColor.Fill = item.Brush;
 
             // update RGBA sliders
-            forceValue = true;
-            sliderRed.Value = item.Brush.Color.R;
-            forceValue = true;
-            sliderGreen.Value = item.Brush.Color.G;
-            forceValue = true;
-            sliderBlue.Value = item.Brush.Color.B;
-            forceValue = true;
-            sliderAlpha.Value = item.Brush.Color.A;
-            forceValue = false;
+            SetSlider(sliderRed, item.Brush.Color.R);
+            SetSlider(sliderGreen, item.Brush.Color.G);
+            SetSlider(sliderBlue, item.Brush.Color.B);
+            SetSlider(sliderAlpha, item.Brush.Color.A);
         }
 
         private void BtnSaveTheme_Click(object sender, RoutedEventArgs e)
@@ -139,7 +140,6 @@ private void BtnSaveTheme_Click(object sender, RoutedEventArgs e)
                 previousSaveFileName = Path.GetFileNameWithoutExtension(themePath);
                 File.WriteAllLines(themePath, iniRows);
                 Console.WriteLine("Saved theme: " + themePath);
-                // TODO close theme editor window?
             }
         }
 
@@ -158,49 +158,39 @@ private void BtnResetTheme_Click(object sender, RoutedEventArgs e)
             if (gridThemeColors.SelectedItem != null)
             {
                 var item = gridThemeColors.SelectedItem as ThemeColor;
-                forceValue = true;
-                sliderRed.Value = item.Brush.Color.R;
-                forceValue = true;
-                sliderGreen.Value = item.Brush.Color.G;
-                forceValue = true;
-                sliderBlue.Value = item.Brush.Color.B;
-                forceValue = true;
-                sliderAlpha.Value = item.Brush.Color.A;
-                forceValue = false;
+                SetSlider(sliderRed, item.Brush.Color.R);
+                SetSlider(sliderGreen, item.Brush.Color.G);
+                SetSlider(sliderBlue, item.Brush.Color.B);
+                SetSlider(sliderAlpha, item.Brush.Color.A);
             }
 
             UpdateColorPreview();
-
             gridThemeColors.Items.Refresh();
         }
 
         private void SliderRed_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
-            if (forceValue == true) return;
-            if (txtRed == null) return; // onchanged is called before other components are ready..thanks wpf :D
+            // onchanged is called before other components are ready..thanks wpf :D
+            if (forceValue == true || txtRed == null) return;
             UpdateColorPreview();
         }
 
         private void SliderGreen_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
-            if (forceValue == true) return;
-            if (txtGreen == null) return;
+            if (forceValue == true || txtGreen == null) return;
             UpdateColorPreview();
         }
 
         private void SliderBlue_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
-            if (forceValue == true) return;
-            if (txtBlue == null) return;
+            if (forceValue == true || txtBlue == null) return;
             UpdateColorPreview();
         }
 
         public void Executed_Undo(object sender, ExecutedRoutedEventArgs e)
         {
             // restore previous color
-            forceValue = true;
-            previousSlider.Value = previousValue;
-            forceValue = false;
+            SetSlider(previousSlider, previousValue);
             UpdateColorPreview();
         }
 
@@ -209,17 +199,6 @@ public void CanExecute_Undo(object sender, CanExecuteRoutedEventArgs e)
             e.CanExecute = previousValue > -1;
         }
 
-        // TODO could add paste HTML code from clipboard
-        //public void Executed_Paste(object sender, ExecutedRoutedEventArgs e)
-        //{
-        //    //OnPasteImageFromClipboard();
-        //}
-
-        //public void CanExecute_Paste(object sender, CanExecuteRoutedEventArgs e)
-        //{
-        //    e.CanExecute = true;
-        //}
-
         private void SliderAlpha_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             if (forceValue == true) return;