CodeMirror/VRCMelonAssistant
1
0
Fork 0
mirror of https://github.com/knah/VRCMelonAssistant.git synced 2024-06-03 11:05:23 +12:00
Code Issues Projects Releases Wiki Activity

Fix button icons not changing colors with theme with only a slightly hacky fix

Browse source
This commit is contained in:
Caeden Statia 2020-02-07 15:38:38 -08:00
parent b5c71387a6
commit 9f0e7eb18c
3 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ModAssistant/Classes/Themes.cs
View file

@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.IO;
using System.Windows.Media;
namespace ModAssistant
{
@ -56,7 +55,7 @@ namespace ModAssistant
return dictionary;
}
public static void ApplyTheme(string theme)
public static void ApplyTheme(string theme, FrameworkElement element)
{
ResourceDictionary newTheme = loadedThemes[theme];
if (newTheme != null)
@ -64,8 +63,25 @@ namespace ModAssistant
Application.Current.Resources.MergedDictionaries.RemoveAt(0);
LoadedTheme = theme;
Application.Current.Resources.MergedDictionaries.Insert(0, newTheme);
ReloadIcons(element);
}
else throw new ArgumentException($"{theme} does not exist.");
}
private static void ReloadIcons(FrameworkElement element)
{
ResourceDictionary icons = Application.Current.Resources.MergedDictionaries.First(x => x.Source.ToString() == "Resources/Icons.xaml");
ChangeColor(element, icons, "AboutIconColor", "heartDrawingGroup");
ChangeColor(element, icons, "InfoIconColor", "info_circleDrawingGroup");
ChangeColor(element, icons, "OptionsIconColor", "cogDrawingGroup");
ChangeColor(element, icons, "ModsIconColor", "microchipDrawingGroup");
}
private static void ChangeColor(FrameworkElement element, ResourceDictionary icons, string ResourceColorName, string DrawingGroupName)
{
element.Resources[ResourceColorName] = loadedThemes[LoadedTheme][ResourceColorName];
((GeometryDrawing)((DrawingGroup)icons[DrawingGroupName]).Children[0]).Brush = (Brush)element.Resources[ResourceColorName];
}
}
}

2
ModAssistant/MainWindow.xaml.cs
View file

@ -61,7 +61,7 @@ namespace ModAssistant
}
Themes.LoadThemes();
Themes.ApplyTheme("Light");
Themes.ApplyTheme("Light", this);
List<string> versions;
string json = string.Empty;

2
ModAssistant/Pages/Options.xaml.cs
View file

@ -256,7 +256,7 @@ namespace ModAssistant.Pages
private void ApplicationThemeComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
Themes.ApplyTheme((sender as ComboBox).SelectedItem.ToString());
Themes.ApplyTheme((sender as ComboBox).SelectedItem.ToString(), this);
}
private void ApplicationThemeExportTemplate_Click(object sender, RoutedEventArgs e)