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

Conflicts

Browse source
This commit is contained in:
Isaac Marovitz 2024-02-10 21:17:42 -05:00
parent 222345207a
commit 59f7a7278c
No known key found for this signature in database
GPG key ID: 97250B2B09A132E1
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,9 +46,9 @@ namespace Ryujinx.Ava
ApplyConfiguredTheme();
ConfigurationState.Instance.Ui.BaseStyle.Event += ThemeChanged_Event;
ConfigurationState.Instance.Ui.CustomThemePath.Event += ThemeChanged_Event;
ConfigurationState.Instance.Ui.EnableCustomTheme.Event += CustomThemeChanged_Event;
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)
@ -91,13 +91,13 @@ namespace Ryujinx.Ava
{
try
{
string baseStyle = ConfigurationState.Instance.Ui.BaseStyle;
string baseStyle = ConfigurationState.Instance.UI.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

4
src/Ryujinx.Ava/Common/Locale/LocaleManager.cs
View file

@ -31,8 +31,8 @@ namespace Ryujinx.Ava.Common.Locale
public void Load()
{
string localeLanguageCode = string.IsNullOrEmpty(ConfigurationState.Instance.Ui.LanguageCode.Value) ?
DefaultLanguageCode : ConfigurationState.Instance.Ui.LanguageCode.Value;
string localeLanguageCode = string.IsNullOrEmpty(ConfigurationState.Instance.UI.LanguageCode.Value) ?
DefaultLanguageCode : ConfigurationState.Instance.UI.LanguageCode.Value;
// Load en_US as default, if the target language translation is incomplete.
LoadDefaultLanguage();

8
src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs
View file

@ -404,10 +404,10 @@ namespace Ryujinx.Ava.UI.ViewModels
if (Program.PreviewerDetached)
{
GameDirectories.Clear();
GameDirectories.AddRange(config.Ui.GameDirs.Value);
GameDirectories.AddRange(config.UI.GameDirs.Value);
}
BaseStyleIndex = config.Ui.BaseStyle == "Light" ? 0 : 1;
BaseStyleIndex = config.UI.BaseStyle == "Light" ? 0 : 1;
// Input
EnableDockedMode = config.System.EnableDockedMode;
@ -491,10 +491,10 @@ namespace Ryujinx.Ava.UI.ViewModels
if (_directoryChanged)
{
List<string> gameDirs = new(GameDirectories);
config.Ui.GameDirs.Value = gameDirs;
config.UI.GameDirs.Value = gameDirs;
}
config.Ui.BaseStyle.Value = BaseStyleIndex == 0 ? "Light" : "Dark";
config.UI.BaseStyle.Value = BaseStyleIndex == 0 ? "Light" : "Dark";
// Input
config.System.EnableDockedMode.Value = EnableDockedMode;