JJBanana13/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-04-26 16:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch ryujinx:master into ui-settings-input

Browse Source
This commit is contained in:
Neo
2025-11-20 02:51:32 -06:00
parent 312c5390ef 39f55b2af3
commit 359af1d310
12 changed files with 110 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
View File

@@ -88,6 +88,11 @@ namespace Ryujinx.Ava.UI.ViewModels
get;
}
public bool IsCustomConfig
{
get;
}
public bool IsGameTitleNotNull => !string.IsNullOrEmpty(GameTitle);
public double PanelOpacity => IsGameTitleNotNull ? 0.5 : 1;
@@ -459,7 +464,7 @@ namespace Ryujinx.Ava.UI.ViewModels
using MemoryStream ms = new(gameIconData);
GameIcon = new Bitmap(ms);
}
IsCustomConfig = customConfig;
IsGameRunning = gameRunning;
GamePath = gamePath;
GameTitle = gameName;
@@ -869,16 +874,11 @@ namespace Ryujinx.Ava.UI.ViewModels
GameListNeedsRefresh = false;
}
private static void RevertIfNotSaved()
private static void RevertIfNotSaved(bool isCustomConfig = false, bool isGameRunning = false)
{
/*
maybe this is an unnecessary check(all options need to be tested)
if (string.IsNullOrEmpty(Program.GlobalConfigurationPath))
{
Program.ReloadConfig();
}
*/
Program.ReloadConfig();
// Restores settings for a custom configuration during a game, if the condition is met.
// If the condition is not met (parameter is false), restores global (default) configuration instead.
Program.ReloadConfig(isCustomConfig && isGameRunning);
}
public void ApplyButton()
@@ -895,14 +895,14 @@ namespace Ryujinx.Ava.UI.ViewModels
File.Delete(gameDir);
}
RevertIfNotSaved();
RevertIfNotSaved(IsCustomConfig, IsGameRunning);
CloseWindow?.Invoke();
}
public void SaveUserConfig()
{
SaveSettings();
RevertIfNotSaved(); // Revert global configuration after saving user configuration
RevertIfNotSaved(IsCustomConfig, IsGameRunning); // Revert global or custom configuration after saving user configuration
CloseWindow?.Invoke();
}
@@ -934,7 +934,7 @@ namespace Ryujinx.Ava.UI.ViewModels
public void CancelButton()
{
RevertIfNotSaved();
RevertIfNotSaved(IsCustomConfig, IsGameRunning);
CloseWindow?.Invoke();
}
}