adding/testing theme color editor

unitycoder · unitycoder · commit b21a6999d227 · 2022-02-14T22:38:03.000+02:00
diff --git a/UnityLauncherPro/Data/ThemeColor.cs b/UnityLauncherPro/Data/ThemeColor.cs
@@ -0,0 +1,25 @@
+﻿using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace UnityLauncherPro
+{
+    public class ThemeColor : IValueConverter
+    {
+        public string Key { get; set; }
+        public SolidColorBrush Brush { get; set; }
+
+
+        object IValueConverter.Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return (SolidColorBrush)value;
+        }
+
+        object IValueConverter.ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/UnityLauncherPro/MainWindow.xaml.cs b/UnityLauncherPro/MainWindow.xaml.cs
@@ -136,6 +136,10 @@ void Start()
 
             }
 
+            // TEST
+            themeEditorWindow = new ThemeEditor();
+            themeEditorWindow.Show();
+
             isInitializing = false;
         }
 
diff --git a/UnityLauncherPro/ThemeEditor.xaml b/UnityLauncherPro/ThemeEditor.xaml
@@ -171,17 +171,33 @@
             </Style.Triggers>
         </Style>
 
+        <local:ThemeColor x:Key="SolidColorBrushConverter"/>
+
     </Window.Resources>
 
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="300"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
+        <!--<DataGrid Grid.Row="0" x:Name="gridThemeColors" KeyboardNavigation.TabNavigation="None" SelectionMode="Single" Margin="3,0" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ThemeButtonForeground}" Background="{DynamicResource ThemeMainBackgroundColor}" IsTabStop="True" TabIndex="1" EnableRowVirtualization="False" VerticalScrollBarVisibility="Visible" SelectionChanged="GridThemeColors_SelectionChanged">-->
         <DataGrid Grid.Row="0" x:Name="gridThemeColors" KeyboardNavigation.TabNavigation="None" SelectionMode="Single" Margin="3,0" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ThemeButtonForeground}" Background="{DynamicResource ThemeMainBackgroundColor}" IsTabStop="True" TabIndex="1" EnableRowVirtualization="False" VerticalScrollBarVisibility="Visible" SelectionChanged="GridThemeColors_SelectionChanged">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Key" Binding="{Binding Key}" IsReadOnly="True" CanUserResize="False"/>
-                <DataGridTextColumn Header="Value" Binding="{Binding Value}" IsReadOnly="True" CanUserResize="False"/>
+                <DataGridTextColumn Header="Value" Binding="{Binding Brush}" IsReadOnly="True" CanUserResize="False">
+                    <DataGridTextColumn.CellStyle>
+                        <Style TargetType="{x:Type DataGridCell}">
+                            <!--TODO make this color opposise of background-->
+                            <Setter Property="Foreground" Value="White" />
+                            <Setter Property="Background" Value="{Binding Brush, Converter={StaticResource SolidColorBrushConverter}}" />
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Brush, Converter={StaticResource SolidColorBrushConverter}}" Value="true">
+                                    <Setter Property="Foreground" Value="{DynamicResource ThemeGridGreenText}" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </DataGridTextColumn.CellStyle>
+                </DataGridTextColumn>
             </DataGrid.Columns>
         </DataGrid>
         <!--tools-->
@@ -204,6 +220,11 @@
                     <Slider x:Name="sliderBlue"  AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" Width="128" Height="28" Value="255" Maximum="255" LargeChange="0" SmallChange="1" ValueChanged="SliderBlue_ValueChanged"/>
                     <TextBox x:Name="txtBlue" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Margin="5,0,0,8" IsReadOnly="True" />
                 </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <Label Foreground="{DynamicResource ThemeButtonForeground}" Width="40">Alpha</Label>
+                    <Slider x:Name="sliderAlpha"  AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" Width="128" Height="28" Value="255" Maximum="255" LargeChange="0" SmallChange="1" ValueChanged="SliderAlpha_ValueChanged"/>
+                    <TextBox x:Name="txtAlpha" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Margin="5,0,0,8" IsReadOnly="True" />
+                </StackPanel>
             </StackPanel>
             
             <Button Style="{StaticResource CustomButton}" x:Name="btnSaveTheme" Background="{DynamicResource ThemeButtonBackground}" Foreground="#FFC1C1C1" BorderBrush="{x:Null}" VerticalAlignment="Center" Height="35" Click="BtnSaveTheme_Click" TabIndex="3" Width="157" Margin="16,0,0,0">
diff --git a/UnityLauncherPro/ThemeEditor.xaml.cs b/UnityLauncherPro/ThemeEditor.xaml.cs
@@ -1,6 +1,8 @@
 ﻿using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Data;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -10,7 +12,9 @@ namespace UnityLauncherPro
     public partial class ThemeEditor : Window
     {
         // TODO take from mainwindow?
-        Dictionary<string, SolidColorBrush> origResourceColors = new Dictionary<string, SolidColorBrush>();
+        //Dictionary<string, SolidColorBrush> origResourceColors = new Dictionary<string, SolidColorBrush>();
+        //public static List<ThemeColor> themeColors;
+        public static ObservableCollection<ThemeColor> themeColors  = new ObservableCollection<ThemeColor>();
 
         public ThemeEditor()
         {
@@ -19,53 +23,71 @@ public ThemeEditor()
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
+            themeColors.Clear();
+
             // get original colors
             foreach (DictionaryEntry item in Application.Current.Resources.MergedDictionaries[0])
             {
                 // take original colors, so can reset them
-                origResourceColors[item.Key.ToString()] = (SolidColorBrush)item.Value;
-                var col = (SolidColorBrush)item.Value;
+                //origResourceColors[item.Key.ToString()] = (SolidColorBrush)item.Value;
+                //var col = (SolidColorBrush)item.Value;
                 //Console.WriteLine(item.Key.ToString() + "=" + col);
-
+                var themeColorPair = new ThemeColor();
+                themeColorPair.Key = item.Key.ToString();
+                themeColorPair.Brush = (SolidColorBrush)item.Value;
+                themeColors.Add(themeColorPair);
                 //var col = new BrushConverter().ConvertFrom(row[1].Trim());
                 // apply color
                 //Application.Current.Resources[row[0]] = (SolidColorBrush)col;
             }
 
             // display current theme keys and values
-            gridThemeColors.ItemsSource = origResourceColors;
+            //gridThemeColors.ItemsSource = origResourceColors;
+            gridThemeColors.ItemsSource = themeColors;
+            //gridThemeColors.DataContext = themeColors;
 
         }
 
-        string selectedKey = null;
+        int selectedRow = -1;
+        bool forceValue = false;
 
         private void GridThemeColors_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
         {
             if (gridThemeColors.SelectedItem == null) return;
             //Console.WriteLine(gridThemeColors.SelectedItem);
-            var k = gridThemeColors.SelectedItem as KeyValuePair<string, SolidColorBrush>?;
-            selectedKey = k.Value.Key;
+            var item = gridThemeColors.SelectedItem as ThemeColor;
+
+            //selectedRow = gridThemeColors.SelectedIndex;
+
+            //selectedKey = k.Value.Key;
             //Console.WriteLine("Selected: " +selectedKey + "=" + origResourceColors[selectedKey].ToString());
 
             // show color
             // TODO show current color AND modified color next to each other
-            rectSelectedColor.Fill = origResourceColors[selectedKey];
+            //rectSelectedColor.Fill = origResourceColors[selectedKey];
+            //var item = (string, SolidColorBrush)gridThemeColors.SelectedItem;
+            rectSelectedColor.Fill = item.Brush;
 
             //txtSelectedColorHex.Text = origResourceColors[selectedKey].ToString();
 
-            sliderRed.Value = origResourceColors[selectedKey].Color.R;
-            sliderGreen.Value = origResourceColors[selectedKey].Color.G;
-            sliderBlue.Value = origResourceColors[selectedKey].Color.B;
-
+            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;
         }
 
         void UpdateColorPreview()
         {
             var newColor = new Color();
-            newColor.A = 255;
             newColor.R = byte.Parse(((int)sliderRed.Value).ToString());
             newColor.G = byte.Parse(((int)sliderGreen.Value).ToString());
             newColor.B = byte.Parse(((int)sliderBlue.Value).ToString());
+            newColor.A = byte.Parse(((int)sliderAlpha.Value).ToString());
             var newColorBrush = new SolidColorBrush(newColor);
             rectSelectedColor.Fill = newColorBrush;
 
@@ -74,34 +96,64 @@ void UpdateColorPreview()
             //origResourceColors[selectedKey] = newColorBrush;
             //gridThemeColors.Items.Refresh();
 
+            //DataRowView rowView = gridThemeColors.Items[ as DataRowView;
+            //rowView.BeginEdit();
+            //rowView[1] = "Change cell here";
+            //rowView.EndEdit();
+            //gridThemeColors.Items.Refresh();
+            //Console.WriteLine(1234);
+
+            //themeColors[gridThemeColors.SelectedIndex].Key = "asdf";
+            themeColors[gridThemeColors.SelectedIndex].Brush = newColorBrush;
+            
+            // NOTE slow but works..
+            gridThemeColors.Items.Refresh();
+
             // TODO apply color changes to mainwindow
         }
 
         private void SliderRed_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
+            if (forceValue == true) return;
             // onchanged is called before other components are ready..wpf :D
             if (txtRed == null) return;
             txtRed.Text = ((int)((Slider)sender).Value).ToString();
             UpdateColorPreview();
+            forceValue = false;
         }
 
         private void SliderGreen_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
+            if (forceValue == true) return;
             if (txtGreen == null) return;
             txtGreen.Text = ((int)((Slider)sender).Value).ToString();
             UpdateColorPreview();
+            forceValue = false;
         }
 
         private void SliderBlue_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
+            if (forceValue == true) return;
             if (txtBlue == null) return;
             txtBlue.Text = ((int)((Slider)sender).Value).ToString();
             UpdateColorPreview();
+            forceValue = false;
+        }
+
+        private void SliderAlpha_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            if (forceValue == true) return;
+            if (txtAlpha == null) return;
+            txtAlpha.Text = ((int)((Slider)sender).Value).ToString();
+            UpdateColorPreview();
+            forceValue = false;
         }
 
         private void BtnSaveTheme_Click(object sender, RoutedEventArgs e)
         {
             Console.WriteLine("TODO save theme to file..");
         }
+
+     
     }
 }
diff --git a/UnityLauncherPro/UnityLauncherPro.csproj b/UnityLauncherPro/UnityLauncherPro.csproj
@@ -79,6 +79,7 @@
     <Compile Include="Data\BuildReportItem.cs" />
     <Compile Include="Data\Platform.cs" />
     <Compile Include="Data\Tabs.cs" />
+    <Compile Include="Data\ThemeColor.cs" />
     <Compile Include="GetProjects.cs" />
     <Compile Include="GetUnityInstallations.cs" />
     <Compile Include="GetUnityUpdates.cs" />

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,10 @@ void Start()`
`136`	`136`
`137`	`137`	`}`
`138`	`138`
	`139`	`+ // TEST`
	`140`	`+ themeEditorWindow = new ThemeEditor();`
	`141`	`+ themeEditorWindow.Show();`
	`142`	`+`
`139`	`143`	`isInitializing = false;`
`140`	`144`	`}`
`141`	`145`