Custom configuration for each game

.github/workflows/release.yml

@@ -10,9 +10,9 @@ env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   RYUJINX_BASE_VERSION: "1.2"
-  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
-  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryubing"
-  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
+  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "master"
+  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Goodfeat"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx_alt"
   RELEASE: 1
 
 jobs:

src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs

@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
+using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
 namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {

src/Ryujinx/AppHost.cs

@@ -582,6 +582,10 @@ private void Exit()
             Rainbow.Disable();
             Rainbow.Reset();
 
+            //Reload settings when the game is turned off
+            //(resets custom settings if there were any)
+            Program.ReloadConfig();
+
             _isStopped = true;
             Stop();
         }

src/Ryujinx/Assets/Styles/Styles.xaml

@@ -1,7 +1,8 @@
-<Styles
+<Styles
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia">
     <Design.PreviewWith>
         <Border Height="2000"
@@ -27,10 +28,11 @@
                             Height="28"
                             HorizontalAlignment="Right"
                             Content="Addy" />
-                        <Button
+                        <Button 
                             Name="btnRem"
                             HorizontalAlignment="Right"
-                            Content="Add" />
+                            Content="Add" 
+                            Classes="red"/>                
                         <TextBox
                             Width="100"
                             VerticalAlignment="Center"
@@ -41,7 +43,12 @@
                     </StackPanel>
                 </Grid>
                 <ui:NumberBox Value="1" />
+                <MenuItem
+                    IconSource="Settings"
+                    Header="123 0000"
+                    ToolTip.Tip="What this"/>
             </StackPanel>
+
         </Border>
     </Design.PreviewWith>
     <Style Selector="DropDownButton">
@@ -373,6 +380,16 @@
         <Setter Property="Background"
                 Value="{DynamicResource AppListHoverBackgroundColor}" />
     </Style>
+    <Style Selector="Button.red /template/ ContentPresenter">
+        <Setter Property="CornerRadius" Value="4"/>
+            <Setter Property="Background" Value="red"/>
+            <Setter Property="Foreground" Value="White"/>
+        </Style>
+        <Style Selector="Button.red:pointerover /template/ ContentPresenter">
+            <Setter Property="CornerRadius" Value="4"/>
+            <Setter Property="Background" Value="{DynamicResource WarningBackgroundColor}" />
+            <Setter Property="Foreground" Value="White"/>
+    </Style>
     <Styles.Resources>
         <SolidColorBrush x:Key="ThemeAccentColorBrush"
                          Color="{DynamicResource SystemAccentColor}" />

src/Ryujinx/Assets/Styles/Themes.xaml

@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
@@ -12,11 +12,13 @@
             <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
             <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
             <Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
+            <Color x:Key="WarningBackgroundColor">#FF6347</Color>
             <Color x:Key="SecondaryTextColor">#A0000000</Color>
             <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
             <Color x:Key="Switch">#FF2EEAC9</Color>
             <Color x:Key="Unbounded">#FFFF4554</Color>
             <Color x:Key="Custom">#6483F5</Color>
+            <Color x:Key="Warning">#800080</Color>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
@@ -29,11 +31,13 @@
             <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
             <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
             <Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
+            <Color x:Key="WarningBackgroundColor">#FF6347</Color>
             <Color x:Key="SecondaryTextColor">#A0000000</Color>
             <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
             <Color x:Key="Switch">#13c3a4</Color>
             <Color x:Key="Unbounded">#FFFF4554</Color>
             <Color x:Key="Custom">#6483F5</Color>
+            <Color x:Key="Warning">#800080</Color>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
@@ -46,11 +50,13 @@
             <Color x:Key="MenuFlyoutPresenterBorderColor">#3D3D3D</Color>
             <Color x:Key="AppListBackgroundColor">#0FFFFFFF</Color>
             <Color x:Key="AppListHoverBackgroundColor">#1EFFFFFF</Color>
+            <Color x:Key="WarningBackgroundColor">#FF6347</Color>
             <Color x:Key="SecondaryTextColor">#A0FFFFFF</Color>
             <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
             <Color x:Key="Switch">#FF2EEAC9</Color>
             <Color x:Key="Unbounded">#FFFF4554</Color>
             <Color x:Key="Custom">#6483F5</Color>
+            <Color x:Key="Warning">#FFA500</Color>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>

src/Ryujinx/Assets/locales.json

@@ -2747,6 +2747,31 @@
         "zh_TW": "在 macOS 的應用程式資料夾中建立捷徑，啟動選取的應用程式"
       }
     },
+    {
+      "ID": "EditGameConfigurationToolTip",
+      "Translations": {
+        "ar_SA": "ينشئ تكوينًا مستقلًا للعبة الحالية",
+        "de_DE": "Erstellt eine unabhängige Konfiguration für das aktuelle Spiel",
+        "el_GR": "Δημιουργεί μια ανεξάρτητη διαμόρφωση για το τρέχον παιχνίδι",
+        "en_US": "Creates an independent configuration for the current game",
+        "es_ES": "Crea una configuración independiente para el juego actual",
+        "fr_FR": "Crée une configuration indépendante pour le jeu en cours",
+        "he_IL": "יוצר תצורה עצמאית למשחק הנוכחי",
+        "it_IT": "Crea una configurazione indipendente per il gioco attuale",
+        "ja_JP": "現在のゲーム用の独立した設定を作成します",
+        "ko_KR": "현재 게임에 대한 독립적인 설정을 생성합니다",
+        "no_NO": "Oppretter en uavhengig konfigurasjon for det gjeldende spillet",
+        "pl_PL": "Tworzy niezależną konfigurację dla bieżącej gry",
+        "pt_BR": "Cria uma configuração independente para o jogo atual",
+        "ru_RU": "Создает независимую конфигурацию для текущей игры",
+        "sv_SE": "Skapar en oberoende konfiguration för det aktuella spelet",
+        "th_TH": "สร้างการกำหนดค่าที่เป็นอิสระสำหรับเกมปัจจุบัน",
+        "tr_TR": "Mevcut oyun için bağımsız bir yapılandırma oluşturur",
+        "uk_UA": "Створює незалежну конфігурацію для поточної гри",
+        "zh_CN": "为当前游戏创建独立的配置",
+        "zh_TW": "為當前遊戲創建獨立的配置"
+      }
+    },
     {
       "ID": "GameListContextMenuShowCompatEntry",
       "Translations": {

src/Ryujinx/Program.cs

@@ -23,6 +23,7 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace Ryujinx.Ava
 {
@@ -32,6 +33,7 @@ internal partial class Program
         public static double DesktopScaleFactor { get; set; } = 1.0;
         public static string Version { get; private set; }
         public static string ConfigurationPath { get; private set; }
+        public static string GlobalConfigurationPath { get; private set; }
         public static bool PreviewerDetached { get; private set; }
         public static bool UseHardwareAcceleration { get; private set; }
 
@@ -155,11 +157,42 @@ private static void Initialize(string[] args)
             }
         }
 
+        public static void ReloadGameConfig(string gamedir)
+        {
+            if (File.Exists(gamedir))
+            {
+                ConfigurationPath = gamedir;
+            }
+
+        }
+
+        public static string GetDirGameUserConfig(string gameId, bool rememberGlobalDir = false, bool changeFolderForGame = false)
+        {
+            string gameDir = Path.Combine(AppDataManager.GamesDirPath, gameId, ReleaseInformation.ConfigName);
+
+            // Should load with the game if there is a custom setting for the game
+            if (rememberGlobalDir)
+            {
+                GlobalConfigurationPath = ConfigurationPath;
+            }
+
+            if (changeFolderForGame)
+            {
+                ConfigurationPath = gameDir;
+            }
+
+            return gameDir;
+        }
+
         public static void ReloadConfig()
         {
+            //It is necessary that when a user setting appears, the global setting remains available
+            GlobalConfigurationPath = null;
+
             string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName);
             string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName);
 
+
             // Now load the configuration as the other subsystems are now registered
             if (File.Exists(localConfigurationPath))
             {
@@ -232,8 +265,35 @@ public static void ReloadConfig()
                     _ => ConfigurationState.Instance.HideCursor,
                 };
 
+            // Check if memoryManagerMode was overridden. 
+            if (CommandLineState.OverrideMemoryManagerMode is not null)
+                if (Enum.TryParse(CommandLineState.OverrideMemoryManagerMode, true, out MemoryManagerMode result))
+                {
+                    ConfigurationState.Instance.System.MemoryManagerMode.Value = result;
+                }
+
+            // Check if PPTC was overridden. 
+            if (CommandLineState.OverridePPTC is not null)
+                if (Enum.TryParse(CommandLineState.OverridePPTC, true, out bool result))
+                {
+                    ConfigurationState.Instance.System.EnablePtc.Value = result;
+                }
+
+            // Check if region was overridden. 
+            if (CommandLineState.OverrideSystemRegion is not null)
+                if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out Ryujinx.HLE.HOS.SystemState.RegionCode result))
+                {
+                    ConfigurationState.Instance.System.Region.Value = (Utilities.Configuration.System.Region)result;
+                }
+
+            //Check if language was overridden. 
+            if (CommandLineState.OverrideSystemLanguage is not null)
+                if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out Ryujinx.HLE.HOS.SystemState.SystemLanguage result))
+                {
+                    ConfigurationState.Instance.System.Language.Value = (Utilities.Configuration.System.Language)result;
+                }
 
-            // Check if hardware-acceleration was overridden.
+            // Check if hardware-acceleration was overridden. MemoryManagerMode ( outdated! )
             if (CommandLineState.OverrideHardwareAcceleration != null)
                 UseHardwareAcceleration = CommandLineState.OverrideHardwareAcceleration.Value;
         }

src/Ryujinx/Ryujinx.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <OutputType>Exe</OutputType>
@@ -172,5 +172,10 @@
   <ItemGroup>
     <Folder Include="Assets\Fonts\Mono\" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="UI\Windows\UserConfigWindows.axaml.cs">
+      <DependentUpon>UserConfigWindows.axaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
 
 </Project>

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml

@@ -19,6 +19,11 @@
         Header="{ext:Locale GameListContextMenuCreateShortcut}"
         Icon="{ext:Icon fa-solid fa-bookmark}"
         ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
+    <MenuItem
+       Click="EditGameConfiguration_Click"
+       Header="Edit Game Configuration"
+       Icon="{ext:Icon fa-solid fa-gear}"
+       ToolTip.Tip="{ext:Locale EditGameConfigurationToolTip}" />
     <MenuItem
         IsVisible="{Binding HasCompatibilityEntry}"
         Click="OpenApplicationCompatibility_Click"

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs

@@ -13,6 +13,7 @@
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -36,6 +37,21 @@ private void InitializeComponent()
             AvaloniaXamlLoader.Load(this);
         }
 
+        public void ToggleUserControl_Click(object sender, RoutedEventArgs args)
+        {
+            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                return;
+
+            viewModel.SelectedApplication.Favorite = !viewModel.SelectedApplication.Favorite;
+
+            ApplicationLibrary.LoadAndSaveMetaData(viewModel.SelectedApplication.IdString, appMetadata =>
+            {
+                appMetadata.Favorite = viewModel.SelectedApplication.Favorite;
+            });
+
+            viewModel.RefreshView();
+        }
+
         public void ToggleFavorite_Click(object sender, RoutedEventArgs args)
         {
             if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
@@ -386,13 +402,27 @@ public void CreateApplicationShortcut_Click(object sender, RoutedEventArgs args)
                     viewModel.SelectedApplication.Icon
                 );
         }
-
+
+        public async void EditGameConfiguration_Click(object sender, RoutedEventArgs args)
+        {
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+            {
+                await new UserConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
+
+                //just checking for file presence
+                viewModel.SelectedApplication.UserConfig = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString,false,false));
+
+                viewModel.RefreshView();
+            }
+
+        }
+
         public async void OpenApplicationCompatibility_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
                 await CompatibilityList.Show(viewModel.SelectedApplication.IdString);
         }
-
+               
         public async void OpenApplicationData_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })