manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-01-10 12:49:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix themeing

Browse source
This commit is contained in:
Isaac Marovitz 2024-02-09 12:45:34 -05:00
parent 474a557e01
commit 5ec8af597e
No known key found for this signature in database
GPG key ID: 97250B2B09A132E1
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Ryujinx.Ava/App.axaml.cs
View file

@ -38,18 +38,17 @@ namespace Ryujinx.Ava
base.OnFrameworkInitializationCompleted(); base.OnFrameworkInitializationCompleted();
if (Program.PreviewerDetached)
{
ApplyConfiguredTheme();
ConfigurationState.Instance.UI.BaseStyle.Event += ThemeChanged_Event; if (!Program.PreviewerDetached)
ConfigurationState.Instance.UI.CustomThemePath.Event += ThemeChanged_Event;
ConfigurationState.Instance.UI.EnableCustomTheme.Event += CustomThemeChanged_Event;
}
else
{ {
ConfigurationState.Initialize(); ConfigurationState.Initialize();
} }
ApplyConfiguredTheme();
ConfigurationState.Instance.Ui.BaseStyle.Event += ThemeChanged_Event;
ConfigurationState.Instance.Ui.CustomThemePath.Event += ThemeChanged_Event;
ConfigurationState.Instance.Ui.EnableCustomTheme.Event += CustomThemeChanged_Event;
} }
private void CustomThemeChanged_Event(object sender, ReactiveEventArgs<bool> e) private void CustomThemeChanged_Event(object sender, ReactiveEventArgs<bool> e)
@ -92,13 +91,13 @@ namespace Ryujinx.Ava
{ {
try try
{ {
string baseStyle = ConfigurationState.Instance.UI.BaseStyle; string baseStyle = ConfigurationState.Instance.Ui.BaseStyle;
if (string.IsNullOrWhiteSpace(baseStyle)) if (string.IsNullOrWhiteSpace(baseStyle))
{ {
ConfigurationState.Instance.UI.BaseStyle.Value = "Dark"; ConfigurationState.Instance.Ui.BaseStyle.Value = "Dark";
baseStyle = ConfigurationState.Instance.UI.BaseStyle; baseStyle = ConfigurationState.Instance.Ui.BaseStyle;
} }
RequestedThemeVariant = baseStyle switch RequestedThemeVariant = baseStyle switch