UI: RPC: Goat Simulator 3 asset image

XC2 has 2 editions, one JP and one global. I own the JP version and
suffered from the soft-lock, meanwhile the current hack only works for
global edition, so PR is simply include JP edition from the hack.

Directory.Packages.props

@@ -17,6 +17,7 @@
     <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0"/>
     <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
     <PackageVersion Include="Concentus" Version="2.2.0" />
     <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
     <PackageVersion Include="DynamicData" Version="9.0.4" />
@@ -41,7 +42,7 @@
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
-    <PackageVersion Include="Gommon" Version="2.7.0" />
+    <PackageVersion Include="Gommon" Version="2.7.0.1" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
     <PackageVersion Include="SharpMetal" Version="1.0.0-preview21" />

src/Ryujinx.Common/BitTricks.cs

@@ -1,35 +0,0 @@
-namespace Ryujinx.Common
-{
-    public class BitTricks
-    {
-        // Never actually written bit packing logic before, so I looked it up.
-        // This code is from https://gist.github.com/Alan-FGR/04938e93e2bffdf5802ceb218a37c195
-        
-        public static ulong PackBitFields(uint[] values, byte[] bitFields)
-        {
-            ulong retVal = values[0]; //we set the first value right away
-            for (int f = 1; f < values.Length; f++)
-            {
-                retVal <<= bitFields[f]; // we shift the previous value
-                retVal += values[f];// and add our current value
-            }
-            return retVal;
-        }
-
-        public static uint[] UnpackBitFields(ulong packed, byte[] bitFields)
-        {
-            int fields = bitFields.Length - 1; // number of fields to unpack
-            uint[] retArr = new uint[fields + 1]; // init return array
-            int curPos = 0; // current field bit position (start)
-            int lastEnd; // position where last field ended
-            for (int f = fields; f >= 0; f--) // loop from last
-            {
-                lastEnd = curPos; // we store where the last value ended
-                curPos += bitFields[f]; // we get where the current value starts
-                int leftShift = 64 - curPos; // we figure how much left shift we gotta apply for the other numbers to overflow into oblivion
-                retArr[f] = (uint)((packed << leftShift) >> leftShift + lastEnd); // we do magic
-            }
-            return retArr;
-        }
-    }
-}

src/Ryujinx.Common/Configuration/DirtyHack.cs

@@ -0,0 +1,60 @@
+using Gommon;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Ryujinx.Common.Configuration
+{
+    [Flags]
+    public enum DirtyHack : byte
+    {
+        Xc2MenuSoftlockFix = 1,
+        ShaderTranslationDelay = 2
+    }
+
+    public readonly struct EnabledDirtyHack(DirtyHack hack, int value)
+    {
+        public DirtyHack Hack => hack;
+        public int Value => value;
+        
+        
+        
+        public ulong Pack() => Raw.PackBitFields(PackedFormat);
+
+        public static EnabledDirtyHack Unpack(ulong packedHack)
+        {
+            var unpackedFields = packedHack.UnpackBitFields(PackedFormat);
+            if (unpackedFields is not [var hack, var value])
+                throw new Exception("The unpack operation on the integer resulted in an invalid unpacked result.");
+            
+            return new EnabledDirtyHack((DirtyHack)hack, (int)value);
+        }
+        
+        private uint[] Raw => [(uint)Hack, (uint)Value.CoerceAtLeast(0)];
+        
+        public static readonly byte[] PackedFormat = [8, 32];
+    }
+
+    public class DirtyHacks : Dictionary<DirtyHack, int>
+    {
+        public DirtyHacks(IEnumerable<EnabledDirtyHack> hacks) 
+            => hacks.ForEach(edh => Add(edh.Hack, edh.Value));
+
+        public DirtyHacks(ulong[] packedHacks) : this(packedHacks.Select(EnabledDirtyHack.Unpack)) {}
+
+        public ulong[] PackEntries() 
+            => Entries.Select(it => it.Pack()).ToArray();
+        
+        public EnabledDirtyHack[] Entries 
+            => this
+                .Select(it => new EnabledDirtyHack(it.Key, it.Value))
+                .ToArray();
+
+        public static implicit operator DirtyHacks(EnabledDirtyHack[] hacks) => new(hacks);
+        public static implicit operator DirtyHacks(ulong[] packedHacks) => new(packedHacks);
+
+        public new int this[DirtyHack hack] => TryGetValue(hack, out var value) ? value : -1;
+
+        public bool IsEnabled(DirtyHack hack) => ContainsKey(hack);
+    }
+}

src/Ryujinx.Common/Configuration/DirtyHacks.cs

@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Ryujinx.Common.Configuration
-{
-    [Flags]
-    public enum DirtyHacks : byte
-    {
-        Xc2MenuSoftlockFix = 1,
-        ShaderCompilationThreadSleep = 2
-    }
-
-    public record EnabledDirtyHack(DirtyHacks Hack, int Value)
-    {
-        public static readonly byte[] PackedFormat = [8, 32];
-        
-        public ulong Pack() => BitTricks.PackBitFields([(uint)Hack, (uint)Value], PackedFormat);
-
-        public static EnabledDirtyHack Unpack(ulong packedHack)
-        {
-            var unpackedFields = BitTricks.UnpackBitFields(packedHack, PackedFormat);
-            if (unpackedFields is not [var hack, var value])
-                throw new ArgumentException(nameof(packedHack));
-            
-            return new EnabledDirtyHack((DirtyHacks)hack, (int)value);
-        }
-    }
-
-    public class DirtyHackCollection : Dictionary<DirtyHacks, int>
-    {
-        public DirtyHackCollection(EnabledDirtyHack[] hacks)
-        {
-            foreach ((DirtyHacks dirtyHacks, int value) in hacks)
-            {
-                Add(dirtyHacks, value);
-            }
-        }
-        
-        public DirtyHackCollection(ulong[] packedHacks)
-        {
-            foreach ((DirtyHacks dirtyHacks, int value) in packedHacks.Select(EnabledDirtyHack.Unpack))
-            {
-                Add(dirtyHacks, value);
-            }
-        }
-
-        public ulong[] PackEntries() =>
-            this
-                .Select(it => 
-                    BitTricks.PackBitFields([(uint)it.Key, (uint)it.Value], EnabledDirtyHack.PackedFormat))
-                .ToArray();
-
-        public static implicit operator DirtyHackCollection(EnabledDirtyHack[] hacks) => new(hacks);
-        public static implicit operator DirtyHackCollection(ulong[] packedHacks) => new(packedHacks);
-
-        public new int this[DirtyHacks hack] => TryGetValue(hack, out var value) ? value : -1;
-
-        public bool IsEnabled(DirtyHacks hack) => ContainsKey(hack);
-    }
-}

src/Ryujinx.Common/ReactiveObject.cs

@@ -53,6 +53,9 @@ namespace Ryujinx.Common
     {
         public static void LogValueChange<T>(LogClass logClass, ReactiveEventArgs<T> eventArgs, string valueName)
         {
+            if (eventArgs.AreValuesEqual)
+                return;
+            
             string message = string.Create(CultureInfo.InvariantCulture, $"{valueName} set to: {eventArgs.NewValue}");
 
             Logger.Info?.Print(logClass, message);
@@ -65,5 +68,22 @@ namespace Ryujinx.Common
     {
         public T OldValue { get; } = oldValue;
         public T NewValue { get; } = newValue;
+
+        public bool AreValuesEqual
+        {
+            get
+            {
+                if (OldValue == null && NewValue == null)
+                    return true;
+
+                if (OldValue == null && NewValue != null)
+                    return false;
+                
+                if (OldValue != null && NewValue == null)
+                    return false;
+
+                return OldValue!.Equals(NewValue);
+            }
+        }
     }
 }

src/Ryujinx.Common/TitleIDs.cs

@@ -171,6 +171,7 @@ namespace Ryujinx.Common
             "0100b41013c82000", // Cruis'n Blast
             "01001b300b9be000", // Diablo III: Eternal Collection
             "01008c8012920000", // Dying Light Platinum Edition
+            "01001cc01b2d4000", // Goat Simulator 3
             "010073c01af34000", // LEGO Horizon Adventures
             "0100770008dd8000", // Monster Hunter Generations Ultimate
             "0100b04011742000", // Monster Hunter Rise

src/Ryujinx.Common/Utilities/BitUtils.cs

@@ -40,5 +40,35 @@ namespace Ryujinx.Common
 
             return (value >> 32) | (value << 32);
         }
+        
+        // Never actually written bit packing logic before, so I looked it up.
+        // This code is from https://gist.github.com/Alan-FGR/04938e93e2bffdf5802ceb218a37c195
+        
+        public static ulong PackBitFields(this uint[] values, byte[] bitFields)
+        {
+            ulong retVal = values[0]; //we set the first value right away
+            for (int f = 1; f < values.Length; f++)
+            {
+                retVal <<= bitFields[f]; // we shift the previous value
+                retVal += values[f];// and add our current value
+            }
+            return retVal;
+        }
+
+        public static uint[] UnpackBitFields(this ulong packed, byte[] bitFields)
+        {
+            int fields = bitFields.Length - 1; // number of fields to unpack
+            uint[] retArr = new uint[fields + 1]; // init return array
+            int curPos = 0; // current field bit position (start)
+            int lastEnd; // position where last field ended
+            for (int f = fields; f >= 0; f--) // loop from last
+            {
+                lastEnd = curPos; // we store where the last value ended
+                curPos += bitFields[f]; // we get where the current value starts
+                int leftShift = 64 - curPos; // we figure how much left shift we gotta apply for the other numbers to overflow into oblivion
+                retArr[f] = (uint)((packed << leftShift) >> leftShift + lastEnd); // we do magic
+            }
+            return retArr;
+        }
     }
 }

src/Ryujinx.Graphics.Gpu/GpuContext.cs

@@ -92,7 +92,11 @@ namespace Ryujinx.Graphics.Gpu
         /// </summary>
         internal SupportBufferUpdater SupportBufferUpdater { get; }
         
-        internal DirtyHackCollection DirtyHacks { get; }
+        /// <summary>
+        /// Enabled dirty hacks.
+        /// Used for workarounds to emulator bugs we can't fix/don't know how to fix yet.
+        /// </summary>
+        internal DirtyHacks DirtyHacks { get; }
         
 
         /// <summary>
@@ -117,7 +121,7 @@ namespace Ryujinx.Graphics.Gpu
         /// Creates a new instance of the GPU emulation context.
         /// </summary>
         /// <param name="renderer">Host renderer</param>
-        public GpuContext(IRenderer renderer, DirtyHackCollection hackCollection)
+        public GpuContext(IRenderer renderer, DirtyHacks hacks)
         {
             Renderer = renderer;
 
@@ -140,7 +144,7 @@ namespace Ryujinx.Graphics.Gpu
 
             SupportBufferUpdater = new SupportBufferUpdater(renderer);
 
-            DirtyHacks = hackCollection;
+            DirtyHacks = hacks;
 
             _firstTimestamp = ConvertNanosecondsToTicks((ulong)PerformanceCounter.ElapsedNanoseconds);
         }

src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs

@@ -367,8 +367,8 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         {
             try
             {
-                if (_context.DirtyHacks.IsEnabled(DirtyHacks.ShaderCompilationThreadSleep))
+                if (_context.Capabilities.Api == TargetApi.Metal && _context.DirtyHacks.IsEnabled(DirtyHack.ShaderTranslationDelay))
-                    Thread.Sleep(_context.DirtyHacks[DirtyHacks.ShaderCompilationThreadSleep]);
+                    Thread.Sleep(_context.DirtyHacks[DirtyHack.ShaderTranslationDelay]);
                 
                 AsyncProgramTranslation asyncTranslation = new(guestShaders, specState, programIndex, isCompute);
                 _asyncTranslationQueue.Add(asyncTranslation, _cancellationToken);

src/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs

@@ -15,8 +15,10 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
         {
             _baseStorage = SharedRef<LibHac.FsSrv.Sf.IStorage>.CreateMove(ref baseStorage);
         }
-
+        
-        private const string Xc2TitleId = "0100e95004038000";
+        private const string Xc2JpTitleId = "0100f3400332c000";
+        private const string Xc2GlobalTitleId = "0100e95004038000";
+        private static bool IsXc2 => TitleIDs.CurrentApplication.Value.OrDefault() is Xc2GlobalTitleId or Xc2JpTitleId;
 
         [CommandCmif(0)]
         // Read(u64 offset, u64 length) -> buffer<u8, 0x46, 0> buffer
@@ -39,7 +41,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
                 using var region = context.Memory.GetWritableRegion(bufferAddress, (int)bufferLen, true);
                 Result result = _baseStorage.Get.Read((long)offset, new OutBuffer(region.Memory.Span), (long)size);
                 
-                if (context.Device.DirtyHacks.IsEnabled(DirtyHacks.Xc2MenuSoftlockFix) && TitleIDs.CurrentApplication.Value == Xc2TitleId)
+                if (context.Device.DirtyHacks.IsEnabled(DirtyHack.Xc2MenuSoftlockFix) && IsXc2)
                 {
                     // Add a load-bearing sleep to avoid XC2 softlock
                     // https://web.archive.org/web/20240728045136/https://github.com/Ryujinx/Ryujinx/issues/2357

src/Ryujinx.HLE/Switch.cs

@@ -40,7 +40,7 @@ namespace Ryujinx.HLE
 
         public bool IsFrameAvailable => Gpu.Window.IsFrameAvailable;
 
-        public DirtyHackCollection DirtyHacks { get; }
+        public DirtyHacks DirtyHacks { get; }
 
         public Switch(HLEConfiguration configuration)
         {
@@ -57,7 +57,7 @@ namespace Ryujinx.HLE
                 : MemoryAllocationFlags.Reserve | MemoryAllocationFlags.Mirrorable;
 
 #pragma warning disable IDE0055 // Disable formatting
-            DirtyHacks        = new DirtyHackCollection(Configuration.Hacks);
+            DirtyHacks        = new DirtyHacks(Configuration.Hacks);
             AudioDeviceDriver = new CompatLayerHardwareDeviceDriver(Configuration.AudioDeviceDriver);
             Memory            = new MemoryBlock(Configuration.MemoryConfiguration.ToDramSize(), memoryAllocationFlags);
             Gpu               = new GpuContext(Configuration.GpuRenderer, DirtyHacks);

src/Ryujinx/AppHost.cs

@@ -3,7 +3,6 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Threading;
-using Gommon;
 using LibHac.Common;
 using LibHac.Ns;
 using LibHac.Tools.FsSystem;
@@ -43,7 +42,6 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.Input;
 using Ryujinx.Input.HLE;
-using Silk.NET.Vulkan;
 using SkiaSharp;
 using SPB.Graphics.Vulkan;
 using System;
@@ -314,7 +312,7 @@ namespace Ryujinx.Ava
             
             _renderer.Window?.ChangeVSyncMode(e.NewValue);
 
-            _viewModel.ShowCustomVSyncIntervalPicker = (e.NewValue == VSyncMode.Custom);
+            _viewModel.UpdateVSyncIntervalPicker();
         }
 
         public void VSyncModeToggle()

src/Ryujinx/Assets/locales.json

@@ -1235,7 +1235,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "자주 묻는 질문(FAQ) 및 안내",
-        "no_NO": "",
+        "no_NO": "Vanlige spørsmål og veiledninger",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "FAQ и Руководства",
@@ -1460,7 +1460,7 @@
         "it_IT": "Preferito",
         "ja_JP": "お気に入り",
         "ko_KR": "즐겨찾기",
-        "no_NO": "",
+        "no_NO": "Favoritter",
         "pl_PL": "Ulubione",
         "pt_BR": "Favorito",
         "ru_RU": "Избранное",
@@ -2610,7 +2610,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "펌웨어 버전 : {0}",
-        "no_NO": "",
+        "no_NO": "Fastvareversjon: {0}",
         "pl_PL": "",
         "pt_BR": "Versão do firmware: {0}",
         "ru_RU": "Версия прошивки: {0}",
@@ -3460,7 +3460,7 @@
         "it_IT": "Corea",
         "ja_JP": "韓国",
         "ko_KR": "한국",
-        "no_NO": "",
+        "no_NO": "Koreansk",
         "pl_PL": "",
         "pt_BR": "Coreia",
         "ru_RU": "Корея",
@@ -4010,7 +4010,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "PC 날짜와 시간에 동기화",
-        "no_NO": "",
+        "no_NO": "Resynkroniser til PC-dato og -klokkeslett",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Повторная синхронизация с датой и временем на компьютере",
@@ -15260,7 +15260,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "시스템 시간을 PC의 현재 날짜 및 시간과 일치하도록 다시 동기화합니다.\n\n이 설정은 활성 설정이 아니므로 여전히 동기화되지 않을 수 있으며, 이 경우 이 버튼을 다시 클릭하면 됩니다.",
-        "no_NO": "",
+        "no_NO": "Resynkroniser systemtiden slik at den samsvarer med PC-ens gjeldende dato og klokkeslett. \\Dette er ikke en aktiv innstilling, men den kan likevel komme ut av synkronisering; i så fall er det bare å klikke på denne knappen igjen.",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Повторно синхронизирует системное время, чтобы оно соответствовало текущей дате и времени вашего компьютера.\n\nЭто не активная настройка, она все еще может рассинхронизироваться; в этом случае просто нажмите эту кнопку еще раз.",
@@ -20535,7 +20535,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "Vulkan을 사용합니다.\nARM 맥에서 해당 플랫폼에서 잘 실행되는 게임을 플레이하는 경우 Metal 후단부를 사용합니다.",
-        "no_NO": "",
+        "no_NO": "Bruker Vulkan \nPå en ARM Mac, og når du spiller et spill som kjører bra under den, bruker du Metal-backend.",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Использует Vulkan.\nНа Mac с ARM процессорами используется Metal, если игра с ним совместима и хорошо работает.",

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -52,7 +52,7 @@ namespace Ryujinx.Headless
             // Make process DPI aware for proper window sizing on high-res screens.
             ForceDpiAware.Windows();
 
-            Console.Title = $"Ryujinx Console {Program.Version} (Headless)";
+            Console.Title = $"HeadlessRyujinx Console {Program.Version}";
 
             if (OperatingSystem.IsMacOS() || OperatingSystem.IsLinux())
             {
@@ -162,6 +162,11 @@ namespace Ryujinx.Headless
             }
             
             ReloadConfig();
+
+            if (option.InheritConfig)
+            {
+                option.InheritMainConfigInput(originalArgs, ConfigurationState.Instance);
+            }
             
             _virtualFileSystem = VirtualFileSystem.CreateInstance();
             _libHacHorizonManager = new LibHacHorizonManager();
@@ -224,15 +229,7 @@ namespace Ryujinx.Headless
             _enableKeyboard = option.EnableKeyboard;
             _enableMouse = option.EnableMouse;
 
-            static void LoadPlayerConfiguration(string inputProfileName, string inputId, PlayerIndex index)
-            {
-                InputConfig inputConfig = HandlePlayerConfiguration(inputProfileName, inputId, index);
 
-                if (inputConfig != null)
-                {
-                    _inputConfiguration.Add(inputConfig);
-                }
-            }
             
             LoadPlayerConfiguration(option.InputProfile1Name, option.InputId1, PlayerIndex.Player1);
             LoadPlayerConfiguration(option.InputProfile2Name, option.InputId2, PlayerIndex.Player2); 
@@ -244,7 +241,6 @@ namespace Ryujinx.Headless
             LoadPlayerConfiguration(option.InputProfile8Name, option.InputId8, PlayerIndex.Player8);
             LoadPlayerConfiguration(option.InputProfileHandheldName, option.InputIdHandheld, PlayerIndex.Handheld);
             
-
             if (_inputConfiguration.Count == 0)
             {
                 return;
@@ -306,6 +302,24 @@ namespace Ryujinx.Headless
             }
 
             _inputManager.Dispose();
+
+            return;
+            
+            void LoadPlayerConfiguration(string inputProfileName, string inputId, PlayerIndex index)
+            {
+                if (index == PlayerIndex.Handheld && _inputConfiguration.Count > 0)
+                {
+                    Logger.Info?.Print(LogClass.Configuration, "Skipping handheld configuration as there are already other players configured.");
+                    return;
+                }
+                
+                InputConfig inputConfig = option.InheritedInputConfigs[index] ?? HandlePlayerConfiguration(inputProfileName, inputId, index);
+
+                if (inputConfig != null)
+                {
+                    _inputConfiguration.Add(inputConfig);
+                }
+            }
         }
 
         private static void SetupProgressHandler()

src/Ryujinx/Headless/Options.cs

@@ -154,10 +154,37 @@ namespace Ryujinx.Headless
             return;
             
             bool NeedsOverride(string argKey) => originalArgs.None(arg => arg.TrimStart('-').EqualsIgnoreCase(OptionName(argKey)));
-
-            string OptionName(string propertyName) =>
-                typeof(Options)!.GetProperty(propertyName)!.GetCustomAttribute<OptionAttribute>()!.LongName;
         }
+
+        public void InheritMainConfigInput(string[] originalArgs, ConfigurationState configurationState)
+        {
+            Dictionary<PlayerIndex, (string InputId, string InputProfileName)> indicesToProperties = new()
+            {
+                { PlayerIndex.Handheld, (nameof(InputIdHandheld), nameof(InputProfileHandheldName)) },
+                { PlayerIndex.Player1, (nameof(InputId1), nameof(InputProfile1Name)) },
+                { PlayerIndex.Player2, (nameof(InputId2), nameof(InputProfile2Name)) },
+                { PlayerIndex.Player3, (nameof(InputId3), nameof(InputProfile3Name)) },
+                { PlayerIndex.Player4, (nameof(InputId4), nameof(InputProfile4Name)) },
+                { PlayerIndex.Player5, (nameof(InputId5), nameof(InputProfile5Name)) },
+                { PlayerIndex.Player6, (nameof(InputId6), nameof(InputProfile6Name)) },
+                { PlayerIndex.Player7, (nameof(InputId7), nameof(InputProfile7Name)) },
+                { PlayerIndex.Player8, (nameof(InputId8), nameof(InputProfile8Name)) }
+            };
+
+            foreach ((PlayerIndex playerIndex, _) in indicesToProperties
+                         .Where(it => NeedsOverride(it.Value.InputId) && NeedsOverride(it.Value.InputProfileName)))
+            {
+                configurationState.Hid.InputConfig.Value.FindFirst(x => x.PlayerIndex == playerIndex)
+                    .IfPresent(ic => InheritedInputConfigs[playerIndex] = ic);
+            }
+
+            return;
+            
+            bool NeedsOverride(string argKey) => originalArgs.None(arg => arg.TrimStart('-').EqualsIgnoreCase(OptionName(argKey)));
+        }
+
+        private static string OptionName(string propertyName) =>
+            typeof(Options)!.GetProperty(propertyName)!.GetCustomAttribute<OptionAttribute>()!.LongName;
         
         // General
         
@@ -391,5 +418,7 @@ namespace Ryujinx.Headless
 
         [Value(0, MetaName = "input", HelpText = "Input to load.", Required = true)]
         public string InputPath { get; set; }
+
+        public SafeDictionary<PlayerIndex, InputConfig> InheritedInputConfigs = new();
     }
 }

src/Ryujinx/Ryujinx.csproj

@@ -49,6 +49,7 @@
     <PackageReference Include="Avalonia.Svg" />
     <PackageReference Include="Avalonia.Svg.Skia" />
     <PackageReference Include="CommandLineParser" />
+    <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="DiscordRichPresence" />
     <PackageReference Include="DynamicData" />
     <PackageReference Include="FluentAvaloniaUI" />
@@ -162,4 +163,4 @@
   <ItemGroup>
     <AdditionalFiles Include="Assets\locales.json" />
   </ItemGroup>
-</Project>
+</Project>

src/Ryujinx/UI/Controls/ApplicationGridView.axaml

@@ -15,7 +15,6 @@
     x:DataType="viewModels:MainWindowViewModel">
     <UserControl.Resources>
         <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
-        <controls:ApplicationContextMenu x:Key="ApplicationContextMenu" />
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -26,10 +25,10 @@
             Padding="8"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch"
-            ContextFlyout="{StaticResource ApplicationContextMenu}"
+            SelectedItem="{Binding GridSelectedApplication}"
+            ContextFlyout="{Binding GridAppContextMenu}"
             DoubleTapped="GameList_DoubleTapped"
-            ItemsSource="{Binding AppsObservableList}"
+            ItemsSource="{Binding AppsObservableList}">
-            SelectionChanged="GameList_SelectionChanged">
             <ListBox.ItemsPanel>
                 <ItemsPanelTemplate>
                     <WrapPanel

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

@@ -26,11 +26,5 @@ namespace Ryujinx.Ava.UI.Controls
             if (sender is ListBox { SelectedItem: ApplicationData selected })
                 RaiseEvent(new ApplicationOpenedEventArgs(selected, ApplicationOpenedEvent));
         }
-
-        public void GameList_SelectionChanged(object sender, SelectionChangedEventArgs args)
-        {
-            if (DataContext is MainWindowViewModel viewModel && sender is ListBox { SelectedItem: ApplicationData selected })
-                viewModel.GridSelectedApplication = selected;
-        }
     }
 }

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -7,7 +7,6 @@
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:converters="clr-namespace:Avalonia.Data.Converters;assembly=Avalonia.Base"
     d:DesignHeight="450"
     d:DesignWidth="800"
     Focusable="True"
@@ -16,7 +15,6 @@
     x:DataType="viewModels:MainWindowViewModel">
     <UserControl.Resources>
         <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
-        <controls:ApplicationContextMenu x:Key="ApplicationContextMenu" />
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -28,10 +26,10 @@
             Padding="8"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch"
-            ContextFlyout="{StaticResource ApplicationContextMenu}"
+            SelectedItem="{Binding ListSelectedApplication}"
+            ContextFlyout="{Binding ListAppContextMenu}"
             DoubleTapped="GameList_DoubleTapped"
-            ItemsSource="{Binding AppsObservableList}"
+            ItemsSource="{Binding AppsObservableList}">
-            SelectionChanged="GameList_SelectionChanged">
             <ListBox.ItemsPanel>
                 <ItemsPanelTemplate>
                     <StackPanel

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

@@ -30,12 +30,6 @@ namespace Ryujinx.Ava.UI.Controls
                 RaiseEvent(new ApplicationOpenedEventArgs(selected, ApplicationOpenedEvent));
         }
 
-        public void GameList_SelectionChanged(object sender, SelectionChangedEventArgs args)
-        {
-            if (DataContext is MainWindowViewModel viewModel && sender is ListBox { SelectedItem: ApplicationData selected })
-                viewModel.ListSelectedApplication = selected;
-        }
-
         private async void IdString_OnClick(object sender, RoutedEventArgs e)
         {
             if (DataContext is not MainWindowViewModel mwvm)

src/Ryujinx/UI/Renderer/RendererHost.axaml

@@ -1,12 +0,0 @@
-<UserControl
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    d:DesignWidth="800"
-    d:DesignHeight="450"
-    x:Class="Ryujinx.Ava.UI.Renderer.RendererHost"
-    FlowDirection="LeftToRight"
-    Focusable="True">
-</UserControl>

src/Ryujinx/UI/Renderer/RendererHost.cs

@@ -1,16 +1,15 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
-using Gommon;
+using Avalonia.Media;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using System;
-using System.Runtime.InteropServices;
 
 namespace Ryujinx.Ava.UI.Renderer
 {
-    public partial class RendererHost : UserControl, IDisposable
+    public class RendererHost : UserControl, IDisposable
     {
         public readonly EmbeddedWindow EmbeddedWindow;
 
@@ -19,7 +18,8 @@ namespace Ryujinx.Ava.UI.Renderer
 
         public RendererHost()
         {
-            InitializeComponent();
+            Focusable = true;
+            FlowDirection = FlowDirection.LeftToRight;
 
             EmbeddedWindow = ConfigurationState.Instance.Graphics.GraphicsBackend.Value switch
             {
@@ -43,8 +43,6 @@ namespace Ryujinx.Ava.UI.Renderer
 
         public RendererHost(string titleId)
         {
-            InitializeComponent();
-
             switch (TitleIDs.SelectGraphicsBackend(titleId, ConfigurationState.Instance.Graphics.GraphicsBackend))
             {
                 case GraphicsBackend.OpenGl:
@@ -109,3 +107,4 @@ namespace Ryujinx.Ava.UI.Renderer
         }
     }
 }
+

src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs

@@ -1,6 +1,7 @@
 using Avalonia.Media.Imaging;
 using Avalonia.Styling;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Utilities.Configuration;
@@ -8,42 +9,11 @@ using System;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class AboutWindowViewModel : BaseModel, IDisposable
+    public partial class AboutWindowViewModel : BaseModel, IDisposable
     {
-        private Bitmap _githubLogo;
+        [ObservableProperty] private Bitmap _githubLogo;
-        private Bitmap _discordLogo;
+        [ObservableProperty] private Bitmap _discordLogo;
-
+        [ObservableProperty] private string _version;
-        private string _version;
-
-        public Bitmap GithubLogo
-        {
-            get => _githubLogo;
-            set
-            {
-                _githubLogo = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public Bitmap DiscordLogo
-        {
-            get => _discordLogo;
-            set
-            {
-                _discordLogo = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public string Version
-        {
-            get => _version;
-            set
-            {
-                _version = value;
-                OnPropertyChanged();
-            }
-        }
 
         public string Developers => "GreemDev";
 

src/Ryujinx/UI/ViewModels/BaseModel.cs

@@ -1,18 +1,10 @@
+using CommunityToolkit.Mvvm.ComponentModel;
 using System;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class BaseModel : INotifyPropertyChanged
+    public class BaseModel : ObservableObject
     {
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-        
         protected void OnPropertiesChanged(string firstPropertyName, params ReadOnlySpan<string> propertyNames)
         {
             OnPropertyChanged(firstPropertyName);

src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs

@@ -2,6 +2,7 @@ using Avalonia.Collections;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DynamicData;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
@@ -17,13 +18,13 @@ using Application = Avalonia.Application;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class DownloadableContentManagerViewModel : BaseModel
+    public partial class DownloadableContentManagerViewModel : BaseModel
     {
         private readonly ApplicationLibrary _applicationLibrary;
         private AvaloniaList<DownloadableContentModel> _downloadableContents = new();
-        private AvaloniaList<DownloadableContentModel> _selectedDownloadableContents = new();
+        [ObservableProperty] private AvaloniaList<DownloadableContentModel> _selectedDownloadableContents = new();
-        private AvaloniaList<DownloadableContentModel> _views = new();
+        [ObservableProperty] private AvaloniaList<DownloadableContentModel> _views = new();
-        private bool _showBundledContentNotice = false;
+        [ObservableProperty] private bool _showBundledContentNotice = false;
 
         private string _search;
         private readonly ApplicationData _applicationData;
@@ -41,26 +42,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public AvaloniaList<DownloadableContentModel> Views
-        {
-            get => _views;
-            set
-            {
-                _views = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public AvaloniaList<DownloadableContentModel> SelectedDownloadableContents
-        {
-            get => _selectedDownloadableContents;
-            set
-            {
-                _selectedDownloadableContents = value;
-                OnPropertyChanged();
-            }
-        }
-
         public string Search
         {
             get => _search;
@@ -77,26 +58,13 @@ namespace Ryujinx.Ava.UI.ViewModels
             get => string.Format(LocaleManager.Instance[LocaleKeys.DlcWindowHeading], DownloadableContents.Count);
         }
 
-        public bool ShowBundledContentNotice
-        {
-            get => _showBundledContentNotice;
-            set
-            {
-                _showBundledContentNotice = value;
-                OnPropertyChanged();
-            }
-        }
-
         public DownloadableContentManagerViewModel(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
         {
             _applicationLibrary = applicationLibrary;
 
             _applicationData = applicationData;
 
-            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            _storageProvider = RyujinxApp.MainWindow.StorageProvider;
-            {
-                _storageProvider = desktop.MainWindow.StorageProvider;
-            }
 
             LoadDownloadableContents();
         }
@@ -138,9 +106,9 @@ namespace Ryujinx.Ava.UI.ViewModels
             // NOTE(jpr): this works around a bug where calling _views.Clear also clears SelectedDownloadableContents for
             // some reason. so we save the items here and add them back after
             var items = SelectedDownloadableContents.ToArray();
-
+            
-            _views.Clear();
+            Views.Clear();
-            _views.AddRange(view);
+            Views.AddRange(view);
 
             foreach (DownloadableContentModel item in items)
             {

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -245,9 +245,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         {
             if (Program.PreviewerDetached)
             {
-                _mainWindow =
+                _mainWindow = RyujinxApp.MainWindow;
-                    (MainWindow)((IClassicDesktopStyleApplicationLifetime)Application.Current
-                        .ApplicationLifetime).MainWindow;
 
                 AvaloniaKeyboardDriver = new AvaloniaKeyboardDriver(owner);
 

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -6,6 +6,7 @@ using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DynamicData;
 using DynamicData.Binding;
 using FluentAvalonia.UI.Controls;
@@ -54,77 +55,77 @@ using ShaderCacheLoadingState = Ryujinx.Graphics.Gpu.Shader.ShaderCacheState;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class MainWindowViewModel : BaseModel
+    public partial class MainWindowViewModel : BaseModel
     {
         private const int HotKeyPressDelayMs = 500;
         private delegate int LoadContentFromFolderDelegate(List<string> dirs, out int numRemoved);
 
-        private ObservableCollectionExtended<ApplicationData> _applications;
+        [ObservableProperty] private ObservableCollectionExtended<ApplicationData> _applications;
-        private string _aspectStatusText;
+        [ObservableProperty] private string _aspectRatioStatusText;
-
+        [ObservableProperty] private string _loadHeading;
-        private string _loadHeading;
+        [ObservableProperty] private string _cacheLoadStatus;
-        private string _cacheLoadStatus;
+        [ObservableProperty] private string _dockedStatusText;
-        private string _searchText;
+        [ObservableProperty] private string _fifoStatusText;
-        private Timer _searchTimer;
+        [ObservableProperty] private string _gameStatusText;
-        private string _dockedStatusText;
+        [ObservableProperty] private string _volumeStatusText;
-        private string _vSyncModeText;
+        [ObservableProperty] private string _gpuNameText;
-        private string _fifoStatusText;
+        [ObservableProperty] private string _backendText;
-        private string _gameStatusText;
+        [ObservableProperty] private string _shaderCountText;
-        private string _volumeStatusText;
+        [ObservableProperty] private bool _showShaderCompilationHint;
-        private string _gpuStatusText;
+        [ObservableProperty] private bool _isFullScreen;
-        private string _shaderCountText;
+        [ObservableProperty] private int _progressMaximum;
+        [ObservableProperty] private int _progressValue;
+        [ObservableProperty] private bool _showMenuAndStatusBar = true;
+        [ObservableProperty] private bool _showStatusSeparator;
+        [ObservableProperty] private Brush _progressBarForegroundColor;
+        [ObservableProperty] private Brush _progressBarBackgroundColor;
+        [ObservableProperty] private Brush _vSyncModeColor;
+        #nullable enable
+        [ObservableProperty] private byte[]? _selectedIcon;
+        #nullable disable
+        [ObservableProperty] private int _statusBarProgressMaximum;
+        [ObservableProperty] private int _statusBarProgressValue;
+        [ObservableProperty] private string _statusBarProgressStatusText;
+        [ObservableProperty] private bool _statusBarProgressStatusVisible;
+        [ObservableProperty] private bool _isPaused;
+        [ObservableProperty] private bool _isLoadingIndeterminate = true;
+        [ObservableProperty] private bool _showAll;
+        [ObservableProperty] private string _lastScannedAmiiboId;
+        [ObservableProperty] private ReadOnlyObservableCollection<ApplicationData> _appsObservableList;
+        [ObservableProperty] private long _lastFullscreenToggle = Environment.TickCount64;
+        [ObservableProperty] private bool _showContent = true;
+        [ObservableProperty] private float _volumeBeforeMute;
+        [ObservableProperty] private bool _areMimeTypesRegistered = FileAssociationHelper.AreMimeTypesRegistered;
+        [ObservableProperty] private Cursor _cursor;
+        [ObservableProperty] private string _title;
+        [ObservableProperty] private WindowState _windowState;
+        [ObservableProperty] private double _windowWidth;
+        [ObservableProperty] private double _windowHeight;
+        [ObservableProperty] private bool _isActive;
+        [ObservableProperty] private bool _isSubMenuOpen;
+        [ObservableProperty] private ApplicationContextMenu _listAppContextMenu;
+        [ObservableProperty] private ApplicationContextMenu _gridAppContextMenu;
+        
+        private bool _showLoadProgress;
+        private bool _isGameRunning;
         private bool _isAmiiboRequested;
         private bool _isAmiiboBinRequested;
-        private bool _showShaderCompilationHint;
+        private string _searchText;
-        private bool _isGameRunning;
+        private Timer _searchTimer;
-        private bool _isFullScreen;
+        private string _vSyncModeText;
-        private int _progressMaximum;
-        private int _progressValue;
-        private long _lastFullscreenToggle = Environment.TickCount64;
-        private bool _showLoadProgress;
-        private bool _showMenuAndStatusBar = true;
-        private bool _showStatusSeparator;
-        private Brush _progressBarForegroundColor;
-        private Brush _progressBarBackgroundColor;
-        private Brush _vSyncModeColor;
-        private byte[] _selectedIcon;
-        private bool _isAppletMenuActive;
-        private int _statusBarProgressMaximum;
-        private int _statusBarProgressValue;
-        private string _statusBarProgressStatusText;
-        private bool _statusBarProgressStatusVisible;
-        private bool _isPaused;
-        private bool _showContent = true;
-        private bool _isLoadingIndeterminate = true;
-        private bool _showAll;
-        private string _lastScannedAmiiboId;
-        private bool _statusBarVisible;
-        private ReadOnlyObservableCollection<ApplicationData> _appsObservableList;
-
         private string _showUiKey = "F4";
         private string _pauseKey = "F5";
         private string _screenshotKey = "F8";
         private float _volume;
-        private float _volumeBeforeMute;
+        private bool _isAppletMenuActive;
-        private string _backendText;
+        private bool _statusBarVisible;
-
-        private bool _areMimeTypesRegistered = FileAssociationHelper.AreMimeTypesRegistered;
         private bool _canUpdate = true;
-        private Cursor _cursor;
-        private string _title;
         private ApplicationData _currentApplicationData;
         private readonly AutoResetEvent _rendererWaitEvent;
-        private WindowState _windowState;
-        private double _windowWidth;
-        private double _windowHeight;
         private int _customVSyncInterval;
         private int _customVSyncIntervalPercentageProxy;
-
+        private ApplicationData _listSelectedApplication;
-        private bool _isActive;
+        private ApplicationData _gridSelectedApplication;
-        private bool _isSubMenuOpen;
-
-        public ApplicationData ListSelectedApplication;
-        public ApplicationData GridSelectedApplication;
         
         // Key is Title ID
         public SafeDictionary<string, LdnGameData.Array> LdnData = [];
@@ -146,8 +147,11 @@ namespace Ryujinx.Ava.UI.ViewModels
             Applications.ToObservableChangeSet()
                 .Filter(Filter)
                 .Sort(GetComparer())
-                .Bind(out _appsObservableList)
+                .OnItemAdded(_ => OnPropertyChanged(nameof(AppsObservableList)))
-                .AsObservableList();
+                .OnItemRemoved(_ => OnPropertyChanged(nameof(AppsObservableList)))
+#pragma warning disable MVVMTK0034 // Event to update is fired below
+                .Bind(out _appsObservableList);
+#pragma warning restore MVVMTK0034
 
             _rendererWaitEvent = new AutoResetEvent(false);
 
@@ -156,8 +160,8 @@ namespace Ryujinx.Ava.UI.ViewModels
                 LoadConfigurableHotKeys();
 
                 Volume = ConfigurationState.Instance.System.AudioVolume;
+                CustomVSyncInterval = ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value;
             }
-            CustomVSyncInterval = ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value;
         }
 
         public void Initialize(
@@ -218,7 +222,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool CanUpdate
         {
-            get => _canUpdate && EnableNonGameRunningControls && Updater.CanUpdate(false);
+            get => _canUpdate && EnableNonGameRunningControls && Updater.CanUpdate();
             set
             {
                 _canUpdate = value;
@@ -226,49 +230,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public Cursor Cursor
-        {
-            get => _cursor;
-            set
-            {
-                _cursor = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public ReadOnlyObservableCollection<ApplicationData> AppsObservableList
-        {
-            get => _appsObservableList;
-            set
-            {
-                _appsObservableList = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool IsPaused
-        {
-            get => _isPaused;
-            set
-            {
-                _isPaused = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public long LastFullscreenToggle
-        {
-            get => _lastFullscreenToggle;
-            set
-            {
-                _lastFullscreenToggle = value;
-
-                OnPropertyChanged();
-            }
-        }
-
         public bool StatusBarVisible
         {
             get => _statusBarVisible && EnableNonGameRunningControls;
@@ -284,17 +245,6 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool ShowFirmwareStatus => !ShowLoadProgress;
 
-        public bool ShowShaderCompilationHint
-        {
-            get => _showShaderCompilationHint;
-            set
-            {
-                _showShaderCompilationHint = value;
-
-                OnPropertyChanged();
-            }
-        }
-
         public bool IsGameRunning
         {
             get => _isGameRunning;
@@ -337,7 +287,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         }
 
         public bool CanScanAmiiboBinaries => AmiiboBinReader.HasAmiiboKeyFile;
-        
+
         public bool ShowLoadProgress
         {
             get => _showLoadProgress;
@@ -349,58 +299,40 @@ namespace Ryujinx.Ava.UI.ViewModels
                 OnPropertyChanged(nameof(ShowFirmwareStatus));
             }
         }
-
+        
-        public string GameStatusText
+        public ApplicationData ListSelectedApplication
         {
-            get => _gameStatusText;
+            get => _listSelectedApplication;
             set
             {
-                _gameStatusText = value;
+                _listSelectedApplication = value;
+
+#pragma warning disable MVVMTK0034
+                if (_listSelectedApplication != null && _listAppContextMenu == null)
+
+                    ListAppContextMenu = new ApplicationContextMenu();
+                else if (_listSelectedApplication == null && _listAppContextMenu != null)
+                    ListAppContextMenu = null!;
+#pragma warning restore MVVMTK0034
 
                 OnPropertyChanged();
             }
         }
 
-        public bool IsFullScreen
+        public ApplicationData GridSelectedApplication
         {
-            get => _isFullScreen;
+            get => _gridSelectedApplication;
             set
             {
-                _isFullScreen = value;
+                _gridSelectedApplication = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool IsSubMenuOpen
-        {
-            get => _isSubMenuOpen;
-            set
-            {
-                _isSubMenuOpen = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool ShowAll
-        {
-            get => _showAll;
-            set
-            {
-                _showAll = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string LastScannedAmiiboId
-        {
-            get => _lastScannedAmiiboId;
-            set
-            {
-                _lastScannedAmiiboId = value;
 
+#pragma warning disable MVVMTK0034
+                if (_gridSelectedApplication != null && _gridAppContextMenu == null)
+                    GridAppContextMenu = new ApplicationContextMenu();
+                else if (_gridSelectedApplication == null && _gridAppContextMenu != null)
+                    GridAppContextMenu = null!;
+#pragma warning restore MVVMTK0034
+                
                 OnPropertyChanged();
             }
         }
@@ -418,87 +350,20 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public bool OpenUserSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.UserAccountSaveDataSize > 0;
+        public bool OpenUserSaveDirectoryEnabled => SelectedApplication.HasControlHolder && SelectedApplication.ControlHolder.Value.UserAccountSaveDataSize > 0;
 
-        public bool OpenDeviceSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.DeviceSaveDataSize > 0;
+        public bool OpenDeviceSaveDirectoryEnabled => SelectedApplication.HasControlHolder && SelectedApplication.ControlHolder.Value.DeviceSaveDataSize > 0;
 
         public bool TrimXCIEnabled => XCIFileTrimmer.CanTrim(SelectedApplication.Path, new XCITrimmerLog.MainWindow(this));
 
-        public bool OpenBcatSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.BcatDeliveryCacheStorageSize > 0;
+        public bool OpenBcatSaveDirectoryEnabled => SelectedApplication.HasControlHolder && SelectedApplication.ControlHolder.Value.BcatDeliveryCacheStorageSize > 0;
 
-        public string LoadHeading
+        public bool ShowCustomVSyncIntervalPicker 
+            => _isGameRunning && AppHost.Device.VSyncMode == VSyncMode.Custom;
+
+        public void UpdateVSyncIntervalPicker()
         {
-            get => _loadHeading;
+            OnPropertyChanged(nameof(ShowCustomVSyncIntervalPicker));
-            set
-            {
-                _loadHeading = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string CacheLoadStatus
-        {
-            get => _cacheLoadStatus;
-            set
-            {
-                _cacheLoadStatus = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public Brush ProgressBarBackgroundColor
-        {
-            get => _progressBarBackgroundColor;
-            set
-            {
-                _progressBarBackgroundColor = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public Brush ProgressBarForegroundColor
-        {
-            get => _progressBarForegroundColor;
-            set
-            {
-                _progressBarForegroundColor = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public Brush VSyncModeColor
-        {
-            get => _vSyncModeColor;
-            set
-            {
-                _vSyncModeColor = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool ShowCustomVSyncIntervalPicker
-        {
-            get
-            {
-                if (_isGameRunning)
-                {
-                    return AppHost.Device.VSyncMode ==
-                           VSyncMode.Custom;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            set
-            {
-                OnPropertyChanged();
-            }
         }
 
         public int CustomVSyncIntervalPercentageProxy
@@ -551,126 +416,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public byte[] SelectedIcon
-        {
-            get => _selectedIcon;
-            set
-            {
-                _selectedIcon = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public int ProgressMaximum
-        {
-            get => _progressMaximum;
-            set
-            {
-                _progressMaximum = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public int ProgressValue
-        {
-            get => _progressValue;
-            set
-            {
-                _progressValue = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public int StatusBarProgressMaximum
-        {
-            get => _statusBarProgressMaximum;
-            set
-            {
-                _statusBarProgressMaximum = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public int StatusBarProgressValue
-        {
-            get => _statusBarProgressValue;
-            set
-            {
-                _statusBarProgressValue = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool StatusBarProgressStatusVisible
-        {
-            get => _statusBarProgressStatusVisible;
-            set
-            {
-                _statusBarProgressStatusVisible = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string StatusBarProgressStatusText
-        {
-            get => _statusBarProgressStatusText;
-            set
-            {
-                _statusBarProgressStatusText = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string FifoStatusText
-        {
-            get => _fifoStatusText;
-            set
-            {
-                _fifoStatusText = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string GpuNameText
-        {
-            get => _gpuStatusText;
-            set
-            {
-                _gpuStatusText = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string ShaderCountText
-        {
-            get => _shaderCountText;
-            set
-            {
-                _shaderCountText = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public string BackendText
-        {
-            get => _backendText;
-            set
-            {
-                _backendText = value;
-
-                OnPropertyChanged();
-            }
-        }
-
         public string VSyncModeText
         {
             get => _vSyncModeText;
@@ -679,39 +424,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 _vSyncModeText = value;
 
                 OnPropertyChanged();
-            }
+                OnPropertyChanged(nameof(ShowCustomVSyncIntervalPicker));
-        }
-
-        public string DockedStatusText
-        {
-            get => _dockedStatusText;
-            set
-            {
-                _dockedStatusText = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string AspectRatioStatusText
-        {
-            get => _aspectStatusText;
-            set
-            {
-                _aspectStatusText = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public string VolumeStatusText
-        {
-            get => _volumeStatusText;
-            set
-            {
-                _volumeStatusText = value;
-
-                OnPropertyChanged();
             }
         }
 
@@ -735,73 +448,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public float VolumeBeforeMute
-        {
-            get => _volumeBeforeMute;
-            set
-            {
-                _volumeBeforeMute = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool ShowStatusSeparator
-        {
-            get => _showStatusSeparator;
-            set
-            {
-                _showStatusSeparator = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool ShowMenuAndStatusBar
-        {
-            get => _showMenuAndStatusBar;
-            set
-            {
-                _showMenuAndStatusBar = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool IsLoadingIndeterminate
-        {
-            get => _isLoadingIndeterminate;
-            set
-            {
-                _isLoadingIndeterminate = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool IsActive
-        {
-            get => _isActive;
-            set
-            {
-                _isActive = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-
-        public bool ShowContent
-        {
-            get => _showContent;
-            set
-            {
-                _showContent = value;
-
-                OnPropertyChanged();
-            }
-        }
-
         public bool IsAppletMenuActive
         {
             get => _isAppletMenuActive && EnableNonGameRunningControls;
@@ -813,39 +459,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public WindowState WindowState
-        {
-            get => _windowState;
-            internal set
-            {
-                _windowState = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public double WindowWidth
-        {
-            get => _windowWidth;
-            set
-            {
-                _windowWidth = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public double WindowHeight
-        {
-            get => _windowHeight;
-            set
-            {
-                _windowHeight = value;
-
-                OnPropertyChanged();
-            }
-        }
-
         public bool IsGrid => Glyph == Glyph.Grid;
         public bool IsList => Glyph == Glyph.List;
 
@@ -889,17 +502,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public string Title
-        {
-            get => _title;
-            set
-            {
-                _title = value;
-
-                OnPropertyChanged();
-            }
-        }
-
         public bool ShowConsoleVisible
         {
             get => ConsoleHelper.SetConsoleWindowStateSupported;
@@ -910,27 +512,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             get => FileAssociationHelper.IsTypeAssociationSupported;
         }
 
-        public bool AreMimeTypesRegistered
-        {
-            get => _areMimeTypesRegistered;
-            set {
-                _areMimeTypesRegistered = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public ObservableCollectionExtended<ApplicationData> Applications
-        {
-            get => _applications;
-            set
-            {
-                _applications = value;
-
-                OnPropertyChanged();
-            }
-        }
-
         public Glyph Glyph
         {
             get => (Glyph)ConfigurationState.Instance.UI.GameListViewMode.Value;
@@ -948,7 +529,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool ShowNames
         {
-            get => ConfigurationState.Instance.UI.ShowNames && ConfigurationState.Instance.UI.GridSize > 1; set
+            get => ConfigurationState.Instance.UI.ShowNames && ConfigurationState.Instance.UI.GridSize > 1; 
+            set
             {
                 ConfigurationState.Instance.UI.ShowNames.Value = value;
 
@@ -1508,8 +1090,6 @@ namespace Ryujinx.Ava.UI.ViewModels
                     }
 
                     VSyncModeText = args.VSyncMode == "Custom" ? "Custom" : "VSync";
-                    ShowCustomVSyncIntervalPicker =
-                        args.VSyncMode == VSyncMode.Custom.ToString();
                     DockedStatusText = args.DockedMode;
                     AspectRatioStatusText = args.AspectRatio;
                     GameStatusText = args.GameStatus;
@@ -2176,7 +1756,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public async void ProcessTrimResult(String filename, Ryujinx.Common.Utilities.XCIFileTrimmer.OperationOutcome operationOutcome)
+        public async void ProcessTrimResult(String filename, XCIFileTrimmer.OperationOutcome operationOutcome)
         {
             string notifyUser = operationOutcome.ToLocalisedText();
 
@@ -2191,12 +1771,8 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 switch (operationOutcome)
                 {
-                    case Ryujinx.Common.Utilities.XCIFileTrimmer.OperationOutcome.Successful:
+                    case XCIFileTrimmer.OperationOutcome.Successful:
-                        if (Avalonia.Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                        RyujinxApp.MainWindow.LoadApplications();
-                        {
-                            if (desktop.MainWindow is MainWindow mainWindow)
-                                mainWindow.LoadApplications();
-                        }
                         break;
                 }
             }

src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs

@@ -1,8 +1,7 @@
-using Avalonia;
 using Avalonia.Collections;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DynamicData;
 using Gommon;
 using Ryujinx.Ava.Common.Locale;
@@ -18,13 +17,13 @@ using System.Linq;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class ModManagerViewModel : BaseModel
+    public partial class ModManagerViewModel : BaseModel
     {
         private readonly string _modJsonPath;
 
         private AvaloniaList<ModModel> _mods = new();
-        private AvaloniaList<ModModel> _views = new();
+        [ObservableProperty] private AvaloniaList<ModModel> _views = new();
-        private AvaloniaList<ModModel> _selectedMods = new();
+        [ObservableProperty] private AvaloniaList<ModModel> _selectedMods = new();
 
         private string _search;
         private readonly ulong _applicationId;
@@ -44,26 +43,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public AvaloniaList<ModModel> Views
-        {
-            get => _views;
-            set
-            {
-                _views = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public AvaloniaList<ModModel> SelectedMods
-        {
-            get => _selectedMods;
-            set
-            {
-                _selectedMods = value;
-                OnPropertyChanged();
-            }
-        }
-
         public string Search
         {
             get => _search;
@@ -86,10 +65,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             _modJsonPath = Path.Combine(AppDataManager.GamesDirPath, applicationId.ToString("x16"), "mods.json");
 
-            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            _storageProvider = RyujinxApp.MainWindow.StorageProvider;
-            {
-                _storageProvider = desktop.MainWindow.StorageProvider;
-            }
 
             LoadMods(applicationId);
         }
@@ -146,8 +122,10 @@ namespace Ryujinx.Ava.UI.ViewModels
                 .Filter(Filter)
                 .Bind(out var view).AsObservableList();
 
+#pragma warning disable MVVMTK0034 // Event to update is fired below
             _views.Clear();
             _views.AddRange(view);
+#pragma warning restore MVVMTK0034
 
             SelectedMods = new(Views.Where(x => x.Enabled));
 

src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs

@@ -1,9 +1,10 @@
-using Gommon;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Gommon;
 using Ryujinx.Ava.Utilities.Configuration;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class SettingsHacksViewModel : BaseModel
+    public partial class SettingsHacksViewModel : BaseModel
     {
         private readonly SettingsViewModel _baseViewModel;
 
@@ -14,33 +15,11 @@ namespace Ryujinx.Ava.UI.ViewModels
             _baseViewModel = settingsVm;
         }
 
-        private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
+        [ObservableProperty] private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
-        private bool _shaderTranslationThreadSleep = ConfigurationState.Instance.Hacks.EnableShaderTranslationDelay;
+        [ObservableProperty] private bool _shaderTranslationDelayEnabled = ConfigurationState.Instance.Hacks.EnableShaderTranslationDelay;
         private int _shaderTranslationSleepDelay = ConfigurationState.Instance.Hacks.ShaderTranslationDelay;
-        
-        public bool Xc2MenuSoftlockFixEnabled
-        {
-            get => _xc2MenuSoftlockFix;
-            set
-            {
-                _xc2MenuSoftlockFix = value;
-                
-                OnPropertyChanged();
-            }
-        }
-        
-        public bool ShaderTranslationDelayEnabled
-        {
-            get => _shaderTranslationThreadSleep;
-            set
-            {
-                _shaderTranslationThreadSleep = value;
-                
-                OnPropertyChanged();
-            }
-        }
 
-        public string ShaderTranslationDelayTooltipText => $"Current value: {ShaderTranslationDelay}"; 
+        public string ShaderTranslationDelayValueText => $"{ShaderTranslationDelay}ms"; 
         
         public int ShaderTranslationDelay
         {
@@ -49,7 +28,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 _shaderTranslationSleepDelay = value;
                 
-                OnPropertiesChanged(nameof(ShaderTranslationDelay), nameof(ShaderTranslationDelayTooltipText));
+                OnPropertiesChanged(nameof(ShaderTranslationDelay), nameof(ShaderTranslationDelayValueText));
             }
         }
         

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -1,6 +1,7 @@
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Gommon;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
@@ -46,9 +47,9 @@ namespace Ryujinx.Ava.UI.ViewModels
         private int _resolutionScale;
         private int _graphicsBackendMultithreadingIndex;
         private float _volume;
-        private bool _isVulkanAvailable = true;
+        [ObservableProperty] private bool _isVulkanAvailable = true;
-        private bool _gameDirectoryChanged;
+        [ObservableProperty] private bool _gameDirectoryChanged;
-        private bool _autoloadDirectoryChanged;
+        [ObservableProperty] private bool _autoloadDirectoryChanged;
         private readonly List<string> _gpuIds = new();
         private int _graphicsBackendIndex;
         private int _scalingFilter;
@@ -63,7 +64,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         private int _networkInterfaceIndex;
         private int _multiplayerModeIndex;
         private string _ldnPassphrase;
-        private string _ldnServer;
+        [ObservableProperty] private string _ldnServer;
 
         public SettingsHacksViewModel DirtyHacks { get; }
 
@@ -111,43 +112,10 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public bool IsVulkanAvailable
-        {
-            get => _isVulkanAvailable;
-            set
-            {
-                _isVulkanAvailable = value;
-
-                OnPropertyChanged();
-            }
-        }
-
         public bool IsOpenGLAvailable => !OperatingSystem.IsMacOS();
 
         public bool IsAppleSiliconMac => OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64;
 
-        public bool GameDirectoryChanged
-        {
-            get => _gameDirectoryChanged;
-            set
-            {
-                _gameDirectoryChanged = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        public bool AutoloadDirectoryChanged
-        {
-            get => _autoloadDirectoryChanged;
-            set
-            {
-                _autoloadDirectoryChanged = value;
-
-                OnPropertyChanged();
-            }
-        }
-
         public bool IsMacOS => OperatingSystem.IsMacOS();
 
         public bool EnableDiscordIntegration { get; set; }
@@ -182,19 +150,12 @@ namespace Ryujinx.Ava.UI.ViewModels
                 _customVSyncInterval = newInterval;
                 _customVSyncIntervalPercentageProxy = value;
                 OnPropertiesChanged(
-                    nameof(CustomVSyncInterval), 
+                    nameof(CustomVSyncInterval),
                     nameof(CustomVSyncIntervalPercentageText));
             }
         }
 
-        public string CustomVSyncIntervalPercentageText
+        public string CustomVSyncIntervalPercentageText => CustomVSyncIntervalPercentageProxy + "%";
-        {
-            get
-            {
-                string text = CustomVSyncIntervalPercentageProxy + "%";
-                return text;
-            }
-        }
 
         public bool EnableCustomVSyncInterval
         {
@@ -356,7 +317,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             set
             {
                 _networkInterfaceIndex = value != -1 ? value : 0;
-                ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value = _networkInterfaces[NetworkInterfaceList[_networkInterfaceIndex]];
             }
         }
 
@@ -366,7 +326,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             set
             {
                 _multiplayerModeIndex = value;
-                ConfigurationState.Instance.Multiplayer.Mode.Value = (MultiplayerMode)_multiplayerModeIndex;
             }
         }
 
@@ -375,16 +334,6 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool IsInvalidLdnPassphraseVisible { get; set; }
 
-        public string LdnServer
-        {
-            get => _ldnServer;
-            set
-            {
-                _ldnServer = value;
-                OnPropertyChanged();
-            }
-        }
-
         public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this()
         {
             _virtualFileSystem = virtualFileSystem;
@@ -466,11 +415,10 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public void MatchSystemTime()
         {
-            var dto = DateTimeOffset.Now;
+            (DateTimeOffset dto, TimeSpan timeOfDay) = DateTimeOffset.Now.Extract();
-
-            CurrentDate = new DateTimeOffset(dto.Year, dto.Month, dto.Day, 0, 0, 0, dto.Offset);
             
-            CurrentTime = dto.TimeOfDay;
+            CurrentDate = dto;
+            CurrentTime = timeOfDay;
             
             OnPropertyChanged(nameof(CurrentDate));
             OnPropertyChanged(nameof(CurrentTime));
@@ -648,16 +596,14 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.ShowTitleBar.Value = ShowTitleBar;
             config.HideCursor.Value = (HideCursorMode)HideCursor;
 
-            if (_gameDirectoryChanged)
+            if (GameDirectoryChanged)
             {
-                List<string> gameDirs = new(GameDirectories);
+                config.UI.GameDirs.Value = [..GameDirectories];
-                config.UI.GameDirs.Value = gameDirs;
             }
 
-            if (_autoloadDirectoryChanged)
+            if (AutoloadDirectoryChanged)
             {
-                List<string> autoloadDirs = new(AutoloadDirectories);
+                config.UI.AutoloadDirs.Value = [..AutoloadDirectories];
-                config.UI.AutoloadDirs.Value = autoloadDirs;
             }
 
             config.UI.BaseStyle.Value = BaseStyleIndex switch
@@ -756,7 +702,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.Multiplayer.LdnServer.Value = LdnServer;
             
             // Dirty Hacks
-            config.Hacks.Xc2MenuSoftlockFix.Value = DirtyHacks.Xc2MenuSoftlockFixEnabled;
+            config.Hacks.Xc2MenuSoftlockFix.Value = DirtyHacks.Xc2MenuSoftlockFix;
             config.Hacks.EnableShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelayEnabled;
             config.Hacks.ShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelay;
 
@@ -767,8 +713,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             SaveSettingsEvent?.Invoke();
 
-            _gameDirectoryChanged = false;
+            GameDirectoryChanged = false;
-            _autoloadDirectoryChanged = false;
+            AutoloadDirectoryChanged = false;
         }
 
         private static void RevertIfNotSaved()

src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs

@@ -1,74 +1,32 @@
 using Avalonia.Collections;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.HLE.FileSystem;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Application = Avalonia.Application;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public record TitleUpdateViewNoUpdateSentinal();
+    public record TitleUpdateViewModelNoUpdate;
 
-    public class TitleUpdateViewModel : BaseModel
+    public partial class TitleUpdateViewModel : BaseModel
     {
         private ApplicationLibrary ApplicationLibrary { get; }
         private ApplicationData ApplicationData { get; }
 
-        private AvaloniaList<TitleUpdateModel> _titleUpdates = new();
+        [ObservableProperty] private AvaloniaList<TitleUpdateModel> _titleUpdates = new();
-        private AvaloniaList<object> _views = new();
+        [ObservableProperty] private AvaloniaList<object> _views = new();
-        private object _selectedUpdate = new TitleUpdateViewNoUpdateSentinal();
+        [ObservableProperty] private object _selectedUpdate = new TitleUpdateViewModelNoUpdate();
-        private bool _showBundledContentNotice = false;
+        [ObservableProperty] private bool _showBundledContentNotice;
 
-        public AvaloniaList<TitleUpdateModel> TitleUpdates
+        private readonly IStorageProvider _storageProvider;
-        {
-            get => _titleUpdates;
-            set
-            {
-                _titleUpdates = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public AvaloniaList<object> Views
-        {
-            get => _views;
-            set
-            {
-                _views = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public object SelectedUpdate
-        {
-            get => _selectedUpdate;
-            set
-            {
-                _selectedUpdate = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public bool ShowBundledContentNotice
-        {
-            get => _showBundledContentNotice;
-            set
-            {
-                _showBundledContentNotice = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public IStorageProvider StorageProvider;
 
         public TitleUpdateViewModel(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
         {
@@ -76,10 +34,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             ApplicationData = applicationData;
 
-            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            _storageProvider = RyujinxApp.MainWindow.StorageProvider;
-            {
-                StorageProvider = desktop.MainWindow.StorageProvider;
-            }
 
             LoadUpdates();
         }
@@ -90,7 +45,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 .Where(it => it.TitleUpdate.TitleIdBase == ApplicationData.IdBase);
 
             bool hasBundledContent = false;
-            SelectedUpdate = new TitleUpdateViewNoUpdateSentinal();
+            SelectedUpdate = new TitleUpdateViewModelNoUpdate();
             foreach ((TitleUpdateModel update, bool isSelected) in updates)
             {
                 TitleUpdates.Add(update);
@@ -116,12 +71,12 @@ namespace Ryujinx.Ava.UI.ViewModels
             var selected = SelectedUpdate;
 
             Views.Clear();
-            Views.Add(new TitleUpdateViewNoUpdateSentinal());
+            Views.Add(new TitleUpdateViewModelNoUpdate());
             Views.AddRange(sortedUpdates);
 
             SelectedUpdate = selected;
 
-            if (SelectedUpdate is TitleUpdateViewNoUpdateSentinal)
+            if (SelectedUpdate is TitleUpdateViewModelNoUpdate)
             {
                 SelectedUpdate = Views[0];
             }
@@ -179,7 +134,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
             else if (update == SelectedUpdate as TitleUpdateModel)
             {
-                SelectedUpdate = new TitleUpdateViewNoUpdateSentinal();
+                SelectedUpdate = new TitleUpdateViewModelNoUpdate();
             }
 
             SortUpdates();
@@ -187,7 +142,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public async Task Add()
         {
-            var result = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+            var result = await _storageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
             {
                 AllowMultiple = true,
                 FileTypeFilter = new List<FilePickerFileType>

src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs

@@ -1,4 +1,5 @@
 using Avalonia.Media;
+using CommunityToolkit.Mvvm.ComponentModel;
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
@@ -20,12 +21,12 @@ using Image = SkiaSharp.SKImage;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    internal class UserFirmwareAvatarSelectorViewModel : BaseModel
+    internal partial class UserFirmwareAvatarSelectorViewModel : BaseModel
     {
         private static readonly Dictionary<string, byte[]> _avatarStore = new();
 
-        private ObservableCollection<ProfileImageModel> _images;
+        [ObservableProperty] private ObservableCollection<ProfileImageModel> _images;
-        private Color _backgroundColor = Colors.White;
+        [ObservableProperty] private Color _backgroundColor = Colors.White;
 
         private int _selectedIndex;
 
@@ -34,27 +35,11 @@ namespace Ryujinx.Ava.UI.ViewModels
             _images = new ObservableCollection<ProfileImageModel>();
 
             LoadImagesFromStore();
-        }
+            PropertyChanged += (_, args) =>
-
-        public Color BackgroundColor
-        {
-            get => _backgroundColor;
-            set
             {
-                _backgroundColor = value;
+                if (args.PropertyName == nameof(BackgroundColor))
-                OnPropertyChanged();
+                    ChangeImageBackground();
-                ChangeImageBackground();
+            };
-            }
-        }
-
-        public ObservableCollection<ProfileImageModel> Images
-        {
-            get => _images;
-            set
-            {
-                _images = value;
-                OnPropertyChanged();
-            }
         }
 
         public int SelectedIndex
@@ -70,7 +55,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 }
                 else
                 {
-                    SelectedImage = _images[_selectedIndex].Data;
+                    SelectedImage = Images[_selectedIndex].Data;
                 }
 
                 OnPropertyChanged();

src/Ryujinx/UI/ViewModels/UserProfileImageSelectorViewModel.cs

@@ -1,18 +1,9 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    internal class UserProfileImageSelectorViewModel : BaseModel
+    internal partial class UserProfileImageSelectorViewModel : BaseModel
     {
-        private bool _firmwareFound;
+        [ObservableProperty] private bool _firmwareFound;
-
-        public bool FirmwareFound
-        {
-            get => _firmwareFound;
-
-            set
-            {
-                _firmwareFound = value;
-                OnPropertyChanged();
-            }
-        }
     }
 }

src/Ryujinx/UI/ViewModels/UserSaveManagerViewModel.cs

@@ -1,3 +1,4 @@
+using CommunityToolkit.Mvvm.ComponentModel;
 using DynamicData;
 using DynamicData.Binding;
 using Ryujinx.Ava.Common.Locale;
@@ -8,74 +9,31 @@ using System.Collections.ObjectModel;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class UserSaveManagerViewModel : BaseModel
+    public partial class UserSaveManagerViewModel : BaseModel
     {
-        private int _sortIndex;
+        [ObservableProperty] private int _sortIndex;
-        private int _orderIndex;
+        [ObservableProperty] private int _orderIndex;
-        private string _search;
+        [ObservableProperty] private string _search;
-        private ObservableCollection<SaveModel> _saves = new();
+        [ObservableProperty] private ObservableCollection<SaveModel> _saves = new();
-        private ObservableCollection<SaveModel> _views = new();
+        [ObservableProperty] private ObservableCollection<SaveModel> _views = new();
         private readonly AccountManager _accountManager;
 
         public string SaveManagerHeading => LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SaveManagerHeading, _accountManager.LastOpenedUser.Name, _accountManager.LastOpenedUser.UserId);
 
-        public int SortIndex
-        {
-            get => _sortIndex;
-            set
-            {
-                _sortIndex = value;
-                OnPropertyChanged();
-                Sort();
-            }
-        }
-
-        public int OrderIndex
-        {
-            get => _orderIndex;
-            set
-            {
-                _orderIndex = value;
-                OnPropertyChanged();
-                Sort();
-            }
-        }
-
-        public string Search
-        {
-            get => _search;
-            set
-            {
-                _search = value;
-                OnPropertyChanged();
-                Sort();
-            }
-        }
-
-        public ObservableCollection<SaveModel> Saves
-        {
-            get => _saves;
-            set
-            {
-                _saves = value;
-                OnPropertyChanged();
-                Sort();
-            }
-        }
-
-        public ObservableCollection<SaveModel> Views
-        {
-            get => _views;
-            set
-            {
-                _views = value;
-                OnPropertyChanged();
-            }
-        }
-
         public UserSaveManagerViewModel(AccountManager accountManager)
         {
             _accountManager = accountManager;
+            PropertyChanged += (_, evt) =>
+            {
+                if (evt.PropertyName is
+                    nameof(SortIndex) or
+                    nameof(OrderIndex) or
+                    nameof(Search) or
+                    nameof(Saves))
+                {
+                    Sort();
+                }
+            };
         }
 
         public void Sort()
@@ -85,8 +43,10 @@ namespace Ryujinx.Ava.UI.ViewModels
                 .Sort(GetComparer())
                 .Bind(out var view).AsObservableList();
 
+#pragma warning disable MVVMTK0034
             _views.Clear();
             _views.AddRange(view);
+#pragma warning restore MVVMTK0034
             OnPropertyChanged(nameof(Views));
         }
 
@@ -94,7 +54,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             if (arg is SaveModel save)
             {
-                return string.IsNullOrWhiteSpace(_search) || save.Title.ToLower().Contains(_search.ToLower());
+                return string.IsNullOrWhiteSpace(Search) || save.Title.ToLower().Contains(Search.ToLower());
             }
 
             return false;

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -247,6 +247,7 @@
                     Header="{ext:Locale MenuBarActionsScanAmiiboBin}"
                     Icon="{ext:Icon mdi-cube-scan}"
                     IsVisible="{Binding CanScanAmiiboBinaries}"
+                    InputGesture="Ctrl + B"
                     IsEnabled="{Binding IsAmiiboBinRequested}" />
                 <MenuItem
                     Command="{Binding TakeScreenshot}"

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.Ava.UI.Views.Main
         private void VSyncMode_PointerReleased(object sender, PointerReleasedEventArgs e)
         {
             Window.ViewModel.ToggleVSyncMode();
-            Logger.Info?.Print(LogClass.Application, $"VSync Mode toggled to: {Window.ViewModel.AppHost.Device.VSyncMode}");
+            Logger.Info?.PrintMsg(LogClass.Application, $"VSync Mode toggled to: {Window.ViewModel.AppHost.Device.VSyncMode}");
         }
 
         private void DockedStatus_PointerReleased(object sender, PointerReleasedEventArgs e)

src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml

@@ -37,7 +37,7 @@
                     ToolTip.Tip="{Binding DirtyHacks.Xc2MenuFixTooltip}">
                     <CheckBox
                         Margin="0"
-                        IsChecked="{Binding DirtyHacks.Xc2MenuSoftlockFixEnabled}"/>
+                        IsChecked="{Binding DirtyHacks.Xc2MenuSoftlockFix}"/>
                     <TextBlock
                         VerticalAlignment="Center"
                         Text="Xenoblade Chronicles 2 Menu Softlock Fix" />
@@ -54,21 +54,27 @@
                     <TextBlock VerticalAlignment="Center"
                                Text="Arbitrary Delay on Shader Translation"/>
                 </StackPanel>
-                <Slider IsVisible="{Binding DirtyHacks.ShaderTranslationDelayEnabled}"
+                <StackPanel
-                        HorizontalAlignment="Center" 
+                    IsVisible="{Binding DirtyHacks.ShaderTranslationDelayEnabled}"
-                        Value="{Binding DirtyHacks.ShaderTranslationDelay}"
+                    Margin="0,10,0,0"
-                        ToolTip.Tip="{Binding DirtyHacks.ShaderTranslationDelayTooltipText}"
+                    Orientation="Horizontal"
-                        Width="175"
+                    HorizontalAlignment="Center">
-                        Margin="0,-3,0,0"
+                    <Slider HorizontalAlignment="Center" 
-                        Height="32"
+                            Value="{Binding DirtyHacks.ShaderTranslationDelay}"
-                        Padding="0,-5"
+                            Width="175"
-                        TickFrequency="1"
+                            Margin="0,-3,0,0"
-                        IsSnapToTickEnabled="True"
+                            Height="32"
-                        LargeChange="10"
+                            Padding="0,-5"
-                        SmallChange="1"
+                            TickFrequency="1"
-                        VerticalAlignment="Center"
+                            IsSnapToTickEnabled="True"
-                        Minimum="1"
+                            LargeChange="10"
-                        Maximum="1000" />
+                            SmallChange="1"
+                            VerticalAlignment="Center"
+                            Minimum="1"
+                            Maximum="1000" />
+                    <TextBlock Margin="5,0"
+                               Text="{Binding DirtyHacks.ShaderTranslationDelayValueText}"/>
+                </StackPanel>
                 <Separator/>
             </StackPanel>
         </Border>

src/Ryujinx/UI/Windows/MainWindow.axaml

@@ -40,6 +40,7 @@
         <KeyBinding Gesture="F9" Command="{Binding ToggleDockMode}" />
         <KeyBinding Gesture="Escape" Command="{Binding ExitCurrentState}" />
         <KeyBinding Gesture="Ctrl+A" Command="{Binding OpenAmiiboWindow}" />
+        <KeyBinding Gesture="Ctrl+B" Command="{Binding OpenBinFile}" />
     </Window.KeyBindings>
     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*">
         <helpers:OffscreenTextBox IsEnabled="False" Opacity="0" Name="HiddenTextBox" IsHitTestVisible="False" IsTabStop="False" />

src/Ryujinx/UI/Windows/ModManagerWindow.axaml

@@ -93,6 +93,7 @@
                                         Padding="10"
                                         MinWidth="0"
                                         MinHeight="0"
+                                        ToolTip.Tip="{Binding Path}"
                                         Click="OpenLocation">
                                         <ui:SymbolIcon
                                             Symbol="OpenFolder"

src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml

@@ -95,7 +95,7 @@
                         </Panel>
                     </DataTemplate>
                     <DataTemplate
-                        DataType="viewModels:TitleUpdateViewNoUpdateSentinal">
+                        DataType="viewModels:TitleUpdateViewModelNoUpdate">
                         <Panel
                             Height="33"
                             Margin="10">

src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs

@@ -33,7 +33,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
         public string Path { get; set; }
         public BlitStruct<ApplicationControlProperty> ControlHolder { get; set; }
 
-        public bool HasControlHolder => ControlHolder.ByteSpan.Length > 0;
+        public bool HasControlHolder => ControlHolder.ByteSpan.Length > 0 && !ControlHolder.ByteSpan.IsZeros();
 
         public string TimePlayedString => ValueFormatUtils.FormatTimeSpan(TimePlayed);
 

src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs

@@ -272,7 +272,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
         public MemoryManagerMode MemoryManagerMode { get; set; }
 
         /// <summary>
-        /// Expands the RAM amount on the emulated system from 4GiB to 8GiB
+        /// Expands the RAM amount on the emulated system
         /// </summary>
         public MemoryConfiguration DramSize { get; set; }
 

src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs

@@ -645,6 +645,9 @@ namespace Ryujinx.Ava.Utilities.Configuration
 
             private void HackChanged(object sender, ReactiveEventArgs<bool> rxe)
             {
+                if (!ShowDirtyHacks) 
+                    return;
+                
                 var newHacks = EnabledHacks.Select(x => x.Hack)
                     .JoinToString(", ");
 
@@ -666,14 +669,14 @@ namespace Ryujinx.Ava.Utilities.Configuration
                     List<EnabledDirtyHack> enabledHacks = [];
                     
                     if (Xc2MenuSoftlockFix)
-                        Apply(DirtyHacks.Xc2MenuSoftlockFix);
+                        Apply(DirtyHack.Xc2MenuSoftlockFix);
                     
                     if (EnableShaderTranslationDelay)
-                        Apply(DirtyHacks.ShaderCompilationThreadSleep, ShaderTranslationDelay);
+                        Apply(DirtyHack.ShaderTranslationDelay, ShaderTranslationDelay);
                     
                     return enabledHacks.ToArray();
 
-                    void Apply(DirtyHacks hack, int value = 0)
+                    void Apply(DirtyHack hack, int value = 0)
                     {
                         enabledHacks.Add(new EnabledDirtyHack(hack, value));
                     }