UI: Update Avalonia to 11.3.6, FluentAvalonia to 2.4.0 (ryubing/ryujinx!118 )

See merge request ryubing/ryujinx!118
UI: fix "Enable UI logs" not being persisted upon relaunch
2026-04-09 07:42:54 +00:00 · 2025-10-25 00:29:51 -05:00 · 2025-10-24 18:25:29 -05:00 · 2025-10-24 10:29:33 -05:00 · 2025-10-24 10:10:31 -05:00 · 2025-10-23 19:11:58 -05:00
28 changed files with 446 additions and 485 deletions
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,25 +3,25 @@
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>
  <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" />
-    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" />
+    <PackageVersion Include="Avalonia" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.6" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.6" />
+    <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.6.2" />
+    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.6.2" />
    <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.4.0" />
-    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0"/>
-    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
+    <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.6.2" />
+    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2"/>
+    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.6.2"/>
    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
    <PackageVersion Include="Concentus" Version="2.2.2" />
    <PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
    <PackageVersion Include="DynamicData" Version="9.4.1" />
-    <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
+    <PackageVersion Include="FluentAvaloniaUI.NoAnim" Version="2.4.0-build3" />
    <PackageVersion Include="Humanizer" Version="2.14.1" />
    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
--- a/src/Ryujinx.HLE/Debugger/Debugger.MainThread.cs
+++ b/src/Ryujinx.HLE/Debugger/Debugger.MainThread.cs
@@ -21,8 +21,9 @@ namespace Ryujinx.HLE.Debugger
            }
            catch (SocketException se)
            {
-                Logger.Notice.Print(LogClass.GdbStub, $"Failed to create TCP client for GDB client: {Enum.GetName(se.SocketErrorCode)}");
-                return;
+                Logger.Error?.Print(LogClass.GdbStub,
+                    $"Failed to create TCP server on {endpoint} for GDB client: {Enum.GetName(se.SocketErrorCode)}");
+                throw;
            }

            Logger.Notice.Print(LogClass.GdbStub, $"Currently waiting on {endpoint} for GDB client");
@@ -33,8 +34,10 @@ namespace Ryujinx.HLE.Debugger
                {
                    _clientSocket = _listenerSocket.AcceptSocket();
                }
-                catch (SocketException)
+                catch (SocketException se)
                {
+                    Logger.Error?.Print(LogClass.GdbStub, 
+                        $"Failed to accept incoming GDB client connection: {Enum.GetName(se.SocketErrorCode)}");
                    return;
                }

@@ -42,7 +45,7 @@ namespace Ryujinx.HLE.Debugger
                int retries = 10;
                while ((DebugProcess == null || GetThreads().Length == 0) && retries-- > 0)
                {
-                    Thread.Sleep(200);
+                    Thread.Sleep(500);
                }

                if (DebugProcess == null || GetThreads().Length == 0)
@@ -57,7 +60,6 @@ namespace Ryujinx.HLE.Debugger
                _readStream = new NetworkStream(_clientSocket, System.IO.FileAccess.Read);
                _writeStream = new NetworkStream(_clientSocket, System.IO.FileAccess.Write);
                _commands = new GdbCommands(_listenerSocket, _clientSocket, _readStream, _writeStream, this);
-                _commandProcessor = _commands.CreateProcessor();

                Logger.Notice.Print(LogClass.GdbStub, "GDB client connected");

@@ -116,7 +118,6 @@ namespace Ryujinx.HLE.Debugger
                _writeStream = null;
                _clientSocket.Close();
                _clientSocket = null;
-                _commandProcessor = null;
                _commands = null;

                BreakpointManager.ClearAll();
--- a/src/Ryujinx.HLE/Debugger/Debugger.MessageHandler.cs
+++ b/src/Ryujinx.HLE/Debugger/Debugger.MessageHandler.cs
@@ -29,14 +29,14 @@ namespace Ryujinx.HLE.Debugger
                        case CommandMessage { Command: { } cmd }:
                            Logger.Debug?.Print(LogClass.GdbStub, $"Received Command: {cmd}");
                            _writeStream.WriteByte((byte)'+');
-                            _commandProcessor.Process(cmd);
+                            _commands.Processor.Process(cmd);
                            break;

                        case ThreadBreakMessage { Context: { } ctx }:
                            DebugProcess.DebugStop();
-                            GThread = CThread = ctx.ThreadUid;
+                            GThreadId = CThreadId = ctx.ThreadUid;
                            _breakHandlerEvent.Set();
-                            _commandProcessor.Reply($"T05thread:{ctx.ThreadUid:x};");
+                            _commands.Processor.Reply($"T05thread:{ctx.ThreadUid:x};");
                            break;
                    }
                }
--- a/src/Ryujinx.HLE/Debugger/Debugger.Rcmd.cs
+++ b/src/Ryujinx.HLE/Debugger/Debugger.Rcmd.cs
@@ -46,54 +46,32 @@ namespace Ryujinx.HLE.Debugger

        public string GetStackTrace()
        {
-            if (GThread == null)
+            if (GThreadId == null)
                return "No thread selected\n";

-            return Process?.Debugger?.GetGuestStackTrace(DebugProcess.GetThread(GThread.Value)) ?? "No application process found\n"; 
+            return Process?.Debugger?.GetGuestStackTrace(DebugProcess.GetThread(GThreadId.Value)) ?? "No application process found\n"; 
        }

        public string GetRegisters()
        {
-            if (GThread == null)
+            if (GThreadId == null)
                return "No thread selected\n";

-            return Process?.Debugger?.GetCpuRegisterPrintout(DebugProcess.GetThread(GThread.Value)) ?? "No application process found\n";
+            return Process?.Debugger?.GetCpuRegisterPrintout(DebugProcess.GetThread(GThreadId.Value)) ?? "No application process found\n";
        }

        public string GetMinidump()
        {
-            StringBuilder response = new();
-            response.AppendLine("=== Begin Minidump ===\n");
-            response.AppendLine(GetProcessInfo());
+            if (Process is not { } kProcess)
+                return "No application process found\n";

-            foreach (KThread thread in GetThreads())
-            {
-                response.AppendLine($"=== Thread {thread.ThreadUid} ===");
-                try
-                {
-                    string stackTrace = Process.Debugger.GetGuestStackTrace(thread);
-                    response.AppendLine(stackTrace);
-                }
-                catch (Exception e)
-                {
-                    response.AppendLine($"[Error getting stack trace: {e.Message}]");
-                }
+            if (kProcess.Debugger is not { } debugger)
+                return "Error getting minidump: debugger is null\n";

-                try
-                {
-                    string registers = Process.Debugger.GetCpuRegisterPrintout(thread);
-                    response.AppendLine(registers);
-                }
-                catch (Exception e)
-                {
-                    response.AppendLine($"[Error getting registers: {e.Message}]");
-                }
-            }
+            string response = debugger.GetMinidump();

-            response.AppendLine("=== End Minidump ===");
-
-            Logger.Info?.Print(LogClass.GdbStub, response.ToString());
-            return response.ToString();
+            Logger.Info?.Print(LogClass.GdbStub, response);
+            return response;
        }

        public string GetProcessInfo()
@@ -103,32 +81,8 @@ namespace Ryujinx.HLE.Debugger
                if (Process is not { } kProcess)
                    return "No application process found\n";

-                StringBuilder sb = new();
-
-                sb.AppendLine($"Program Id:  0x{kProcess.TitleId:x16}");
-                sb.AppendLine($"Application: {(kProcess.IsApplication ? 1 : 0)}");
-                sb.AppendLine("Layout:");
-                sb.AppendLine(
-                    $"  Alias: 0x{kProcess.MemoryManager.AliasRegionStart:x10} - 0x{kProcess.MemoryManager.AliasRegionEnd - 1:x10}");
-                sb.AppendLine(
-                    $"  Heap:  0x{kProcess.MemoryManager.HeapRegionStart:x10} - 0x{kProcess.MemoryManager.HeapRegionEnd - 1:x10}");
-                sb.AppendLine(
-                    $"  Aslr:  0x{kProcess.MemoryManager.AslrRegionStart:x10} - 0x{kProcess.MemoryManager.AslrRegionEnd - 1:x10}");
-                sb.AppendLine(
-                    $"  Stack: 0x{kProcess.MemoryManager.StackRegionStart:x10} - 0x{kProcess.MemoryManager.StackRegionEnd - 1:x10}");
-
-                sb.AppendLine("Modules:");
-                HleProcessDebugger debugger = kProcess.Debugger;
-                if (debugger != null)
-                {
-                    foreach (HleProcessDebugger.Image image in debugger.GetLoadedImages())
-                    {
-                        ulong endAddress = image.BaseAddress + image.Size - 1;
-                        sb.AppendLine($"  0x{image.BaseAddress:x10} - 0x{endAddress:x10} {image.Name}");
-                    }
-                }
-
-                return sb.ToString();
+                return kProcess.Debugger?.GetProcessInfoPrintout() 
+                       ?? "Error getting process info: debugger is null\n";
            }
            catch (Exception e)
            {
--- a/src/Ryujinx.HLE/Debugger/Debugger.cs
+++ b/src/Ryujinx.HLE/Debugger/Debugger.cs
@@ -1,9 +1,11 @@
+using Gommon;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.Debugger.Gdb;
 using Ryujinx.HLE.HOS.Kernel.Process;
 using Ryujinx.HLE.HOS.Kernel.Threading;
 using System;
 using System.Collections.Concurrent;
+using System.Diagnostics;
 using System.Linq;
 using System.Net.Sockets;
 using System.Threading;
@@ -26,15 +28,18 @@ namespace Ryujinx.HLE.Debugger
        private Socket _clientSocket;
        private NetworkStream _readStream;
        private NetworkStream _writeStream;
-
-        private GdbCommandProcessor _commandProcessor;
+        
        private GdbCommands _commands;

        private bool _shuttingDown;
        private readonly ManualResetEventSlim _breakHandlerEvent = new(false);

-        internal ulong? CThread;
-        internal ulong? GThread;
+        internal ulong? CThreadId;
+        internal ulong? GThreadId;
+
+        internal KThread CThread => CThreadId?.Into(DebugProcess.GetThread);
+        
+        internal KThread GThread => GThreadId?.Into(DebugProcess.GetThread);

        public readonly BreakpointManager BreakpointManager;

@@ -57,7 +62,7 @@ namespace Ryujinx.HLE.Debugger

        internal KThread[] GetThreads() => DebugProcess.ThreadUids.Select(DebugProcess.GetThread).ToArray();

-        internal bool IsProcess32Bit => DebugProcess.GetThread(GThread ?? DebugProcess.ThreadUids.First()).Context.IsAarch32;
+        internal bool IsProcess32Bit => DebugProcess.GetThread(GThreadId ?? DebugProcess.ThreadUids.First()).Context.IsAarch32;

        internal bool WriteRegister(IExecutionContext ctx, int registerId, StringStream ss) =>
            IsProcess32Bit
--- a/src/Ryujinx.HLE/Debugger/Gdb/CommandProcessor.cs
+++ b/src/Ryujinx.HLE/Debugger/Gdb/CommandProcessor.cs
@@ -181,7 +181,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
                    if (ss.ConsumeRemaining("fThreadInfo"))
                    {
                        Reply(
-                            $"m{Debugger.DebugProcess.ThreadUids.Select(x => $"{x:x}").JoinToString(",")}");
+                            $"m{DebugProcess.ThreadUids.Select(x => $"{x:x}").JoinToString(",")}");
                        break;
                    }

--- a/src/Ryujinx.HLE/Debugger/Gdb/Commands.cs
+++ b/src/Ryujinx.HLE/Debugger/Gdb/Commands.cs
@@ -11,19 +11,18 @@ namespace Ryujinx.HLE.Debugger.Gdb
 {
    class GdbCommands
    {
-        const int GdbRegisterCount64 = 68;
-        const int GdbRegisterCount32 = 66;
-
        public readonly Debugger Debugger;

-        public GdbCommandProcessor Processor { get; private set; }
+        private GdbCommandProcessor _processor;
+
+        public GdbCommandProcessor Processor
+            => _processor ??= new GdbCommandProcessor(this);

        internal readonly TcpListener ListenerSocket;
        internal readonly Socket ClientSocket;
        internal readonly NetworkStream ReadStream;
        internal readonly NetworkStream WriteStream;

-
        public GdbCommands(TcpListener listenerSocket, Socket clientSocket, NetworkStream readStream,
            NetworkStream writeStream, Debugger debugger)
        {
@@ -34,52 +33,37 @@ namespace Ryujinx.HLE.Debugger.Gdb
            Debugger = debugger;
        }

-        public void SetProcessor(GdbCommandProcessor commandProcessor)
-        {
-            if (Processor != null) return;
-
-            Processor = commandProcessor;
-        }
-        
-        public GdbCommandProcessor CreateProcessor()
-        {
-            if (Processor != null) 
-                return Processor;
-
-            return Processor = new GdbCommandProcessor(this);
-        }
-
        internal void Query()
        {
            // GDB is performing initial contact. Stop everything.
            Debugger.DebugProcess.DebugStop();
-            Debugger.GThread = Debugger.CThread = Debugger.DebugProcess.ThreadUids.First();
-            Processor.Reply($"T05thread:{Debugger.CThread:x};");
+            Debugger.GThreadId = Debugger.CThreadId = Debugger.DebugProcess.ThreadUids.First();
+            Processor.Reply($"T05thread:{Debugger.CThreadId:x};");
        }

        internal void Interrupt()
        {
            // GDB is requesting an interrupt. Stop everything.
            Debugger.DebugProcess.DebugStop();
-            if (Debugger.GThread == null || Debugger.GetThreads().All(x => x.ThreadUid != Debugger.GThread.Value))
+            if (Debugger.GThreadId == null || Debugger.GetThreads().All(x => x.ThreadUid != Debugger.GThreadId.Value))
            {
-                Debugger.GThread = Debugger.CThread = Debugger.DebugProcess.ThreadUids.First();
+                Debugger.GThreadId = Debugger.CThreadId = Debugger.DebugProcess.ThreadUids.First();
            }

-            Processor.Reply($"T02thread:{Debugger.GThread:x};");
+            Processor.Reply($"T02thread:{Debugger.GThreadId:x};");
        }

        internal void Continue(ulong? newPc)
        {
            if (newPc.HasValue)
            {
-                if (Debugger.CThread == null)
+                if (Debugger.CThreadId == null)
                {
                    Processor.ReplyError();
                    return;
                }

-                Debugger.DebugProcess.GetThread(Debugger.CThread.Value).Context.DebugPc = newPc.Value;
+                Debugger.CThread.Context.DebugPc = newPc.Value;
            }

            Debugger.DebugProcess.DebugContinue();
@@ -94,24 +78,24 @@ namespace Ryujinx.HLE.Debugger.Gdb

        internal void ReadRegisters()
        {
-            if (Debugger.GThread == null)
+            if (Debugger.GThreadId == null)
            {
                Processor.ReplyError();
                return;
            }

-            IExecutionContext ctx = Debugger.DebugProcess.GetThread(Debugger.GThread.Value).Context;
+            IExecutionContext ctx = Debugger.GThread.Context;
            string registers = string.Empty;
            if (Debugger.IsProcess32Bit)
            {
-                for (int i = 0; i < GdbRegisterCount32; i++)
+                for (int i = 0; i < GdbRegisters.Count32; i++)
                {
                    registers += ctx.ReadRegister32(i);
                }
            }
            else
            {
-                for (int i = 0; i < GdbRegisterCount64; i++)
+                for (int i = 0; i < GdbRegisters.Count64; i++)
                {
                    registers += ctx.ReadRegister64(i);
                }
@@ -122,16 +106,16 @@ namespace Ryujinx.HLE.Debugger.Gdb

        internal void WriteRegisters(StringStream ss)
        {
-            if (Debugger.GThread == null)
+            if (Debugger.GThreadId == null)
            {
                Processor.ReplyError();
                return;
            }

-            IExecutionContext ctx = Debugger.DebugProcess.GetThread(Debugger.GThread.Value).Context;
+            IExecutionContext ctx = Debugger.GThread.Context;
            if (Debugger.IsProcess32Bit)
            {
-                for (int i = 0; i < GdbRegisterCount32; i++)
+                for (int i = 0; i < GdbRegisters.Count32; i++)
                {
                    if (!ctx.WriteRegister32(i, ss))
                    {
@@ -142,7 +126,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
            }
            else
            {
-                for (int i = 0; i < GdbRegisterCount64; i++)
+                for (int i = 0; i < GdbRegisters.Count64; i++)
                {
                    if (!ctx.WriteRegister64(i, ss))
                    {
@@ -178,11 +162,11 @@ namespace Ryujinx.HLE.Debugger.Gdb
            switch (op)
            {
                case 'c':
-                    Debugger.CThread = threadId;
+                    Debugger.CThreadId = threadId;
                    Processor.ReplyOK();
                    return;
                case 'g':
-                    Debugger.GThread = threadId;
+                    Debugger.GThreadId = threadId;
                    Processor.ReplyOK();
                    return;
                default:
@@ -230,13 +214,13 @@ namespace Ryujinx.HLE.Debugger.Gdb

        internal void ReadRegister(int gdbRegId)
        {
-            if (Debugger.GThread == null)
+            if (Debugger.GThreadId == null)
            {
                Processor.ReplyError();
                return;
            }

-            IExecutionContext ctx = Debugger.DebugProcess.GetThread(Debugger.GThread.Value).Context;
+            IExecutionContext ctx = Debugger.GThread.Context;
            string result = Debugger.ReadRegister(ctx, gdbRegId);

            Processor.Reply(result != null, result);
@@ -244,26 +228,26 @@ namespace Ryujinx.HLE.Debugger.Gdb

        internal void WriteRegister(int gdbRegId, StringStream ss)
        {
-            if (Debugger.GThread == null)
+            if (Debugger.GThreadId == null)
            {
                Processor.ReplyError();
                return;
            }

-            IExecutionContext ctx = Debugger.DebugProcess.GetThread(Debugger.GThread.Value).Context;
-            
-            Processor.Reply(Debugger.WriteRegister(ctx, gdbRegId, ss) && ss.IsEmpty);
+            Processor.Reply(
+                success: Debugger.WriteRegister(Debugger.GThread.Context, gdbRegId, ss) && ss.IsEmpty
+            );
        }

        internal void Step(ulong? newPc)
        {
-            if (Debugger.CThread == null)
+            if (Debugger.CThreadId == null)
            {
                Processor.ReplyError();
                return;
            }

-            KThread thread = Debugger.DebugProcess.GetThread(Debugger.CThread.Value);
+            KThread thread = Debugger.CThread;

            if (newPc.HasValue)
            {
@@ -276,7 +260,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
            }
            else
            {
-                Debugger.GThread = Debugger.CThread = thread.ThreadUid;
+                Debugger.GThreadId = Debugger.CThreadId = thread.ThreadUid;
                Processor.Reply($"T05thread:{thread.ThreadUid:x};");
            }
        }
@@ -330,7 +314,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
                    _ => VContAction.None
                };

-                // Note: We don't support signals yet.
+                // TODO: Note: We don't support signals yet.
                //ushort? signal = null;
                if (cmd is 'C' or 'S')
                {
@@ -339,24 +323,22 @@ namespace Ryujinx.HLE.Debugger.Gdb
                    // since that method advances the underlying string position
                }

-                ulong? threadId = null;
-                if (stream.ConsumePrefix(":"))
-                {
-                    threadId = stream.ReadRemainingAsThreadUid();
-                }
+                ulong? threadId = stream.ConsumePrefix(":") 
+                    ? stream.ReadRemainingAsThreadUid()
+                    : null;

                if (threadId.HasValue)
                {
                    if (threadActionMap.ContainsKey(threadId.Value))
                    {
-                        threadActionMap[threadId.Value] = new VContPendingAction(action/*, signal*/);
+                        threadActionMap[threadId.Value] = new VContPendingAction(action /*, signal*/);
                    }
                }
                else
                {
                    foreach (ulong thread in threadActionMap.Keys)
                    {
-                        threadActionMap[thread] = new VContPendingAction(action/*, signal*/);
+                        threadActionMap[thread] = new VContPendingAction(action /*, signal*/);
                    }

                    if (action == VContAction.Continue)
@@ -409,7 +391,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
            {
                if (action.Action == VContAction.Step)
                {
-                    Debugger.GThread = Debugger.CThread = threadUid;
+                    Debugger.GThreadId = Debugger.CThreadId = threadUid;
                    Processor.Reply($"T05thread:{threadUid:x};");
                }
            }
--- a/src/Ryujinx.HLE/Debugger/Gdb/Registers.cs
+++ b/src/Ryujinx.HLE/Debugger/Gdb/Registers.cs
@@ -6,6 +6,9 @@ namespace Ryujinx.HLE.Debugger.Gdb
 {
    static class GdbRegisters
    {
+        public const int Count64 = 68;
+        public const int Count32 = 66;
+
        /*
        FPCR = FPSR & ~FpcrMask
        All of FPCR's bits are reserved in FPCR and vice versa,
@@ -13,6 +16,8 @@ namespace Ryujinx.HLE.Debugger.Gdb
        */
        private const uint FpcrMask = 0xfc1fffff;

+        #region 64-bit
+
        public static string ReadRegister64(this IExecutionContext state, int registerId) =>
            registerId switch
            {
@@ -71,6 +76,10 @@ namespace Ryujinx.HLE.Debugger.Gdb
            }
        }

+        #endregion
+
+        #region 32-bit
+
        public static string ReadRegister32(this IExecutionContext state, int registerId)
        {
            switch (registerId)
@@ -146,5 +155,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
                    return false;
            }
        }
+
+        #endregion
    }
 }
--- a/src/Ryujinx.HLE/Debugger/IDebuggableProcess.cs
+++ b/src/Ryujinx.HLE/Debugger/IDebuggableProcess.cs
@@ -9,7 +9,7 @@ namespace Ryujinx.HLE.Debugger
        IVirtualMemoryManager CpuMemory { get; }
        ulong[] ThreadUids { get; }
        DebugState DebugState { get; }
-        
+
        void DebugStop();
        void DebugContinue();
        void DebugContinue(KThread thread);
--- a/src/Ryujinx.HLE/Debugger/Message.cs
+++ b/src/Ryujinx.HLE/Debugger/Message.cs
@@ -26,11 +26,9 @@ namespace Ryujinx.HLE.Debugger
        public readonly string Command;

        public CommandMessage(string cmd)
-        {
-            Command = cmd;
-        }
+            => Command = cmd;
    }
-    
+
    public class ThreadBreakMessage : Message.IMarker
    {
        public IExecutionContext Context { get; }
--- a/src/Ryujinx.HLE/Debugger/RegisterInformation.cs
+++ b/src/Ryujinx.HLE/Debugger/RegisterInformation.cs
@@ -3,7 +3,7 @@ using System.IO;

 namespace Ryujinx.HLE.Debugger
 {
-    class RegisterInformation
+    static class RegisterInformation
    {
        public static readonly Dictionary<string, string> Features = new()
        {
--- a/src/Ryujinx.HLE/HOS/Kernel/Process/HleProcessDebugger.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Process/HleProcessDebugger.cs
@@ -161,6 +161,116 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
            return sb.ToString();
        }

+        public string GetProcessInfoPrintout()
+        {
+            StringBuilder sb = new();
+
+            sb.AppendLine($"Process: {_owner.Name}, PID: {_owner.Pid}");
+            sb.AppendLine($"Program Id:  0x{_owner.TitleId:x16}");
+            sb.AppendLine($"Application: {(_owner.IsApplication ? 1 : 0)}");
+
+            sb.AppendLine("Layout:");
+            sb.AppendLine(
+                $"  Alias: 0x{_owner.MemoryManager.AliasRegionStart:x10} - 0x{_owner.MemoryManager.AliasRegionEnd - 1:x10}");
+            sb.AppendLine(
+                $"  Heap:  0x{_owner.MemoryManager.HeapRegionStart:x10} - 0x{_owner.MemoryManager.HeapRegionEnd - 1:x10}");
+            sb.AppendLine(
+                $"  Aslr:  0x{_owner.MemoryManager.AslrRegionStart:x10} - 0x{_owner.MemoryManager.AslrRegionEnd - 1:x10}");
+            sb.AppendLine(
+                $"  Stack: 0x{_owner.MemoryManager.StackRegionStart:x10} - 0x{_owner.MemoryManager.StackRegionEnd - 1:x10}");
+
+            sb.AppendLine("Modules:");
+
+            foreach (Image image in GetLoadedImages())
+            {
+                ulong endAddress = image.BaseAddress + image.Size - 1;
+                sb.AppendLine($"  0x{image.BaseAddress:x10} - 0x{endAddress:x10} {image.Name}");
+            }
+
+            return sb.ToString();
+        }
+
+        public string GetMinidump()
+        {
+            var result = new StringBuilder();
+
+            result.AppendLine("=== Begin Minidump ===\n");
+            try
+            {
+                result.AppendLine(GetProcessInfoPrintout());
+            }
+            catch (Exception e)
+            {
+                result.AppendLine($"[Error getting process info: {e.Message}]");
+            }
+
+            var debugInterface = _owner?.DebugInterface;
+
+            if (debugInterface != null)
+            {
+                ulong[] threadUids;
+
+                try
+                {
+                    threadUids = debugInterface.ThreadUids ?? [];
+                }
+                catch (Exception e)
+                {
+                    result.AppendLine($"[Error getting thread uids: {e.Message}]");
+                    threadUids = [];
+                }
+
+                foreach (ulong threadUid in threadUids)
+                {
+                    result.AppendLine($"=== Thread {threadUid} ===");
+
+                    KThread thread;
+
+                    try
+                    {
+                        thread = debugInterface.GetThread(threadUid);
+                    }
+                    catch (Exception e)
+                    {
+                        result.AppendLine($"[Error getting thread: {e.Message}]");
+                        continue;
+                    }
+
+                    if (thread == null)
+                    {
+                        result.AppendLine("[Thread not found]");
+                        continue;
+                    }
+
+                    try
+                    {
+                        result.AppendLine(GetGuestStackTrace(thread));
+                    }
+                    catch (Exception e)
+                    {
+                        result.AppendLine($"[Error getting stack trace: {e.Message}]");
+                    }
+
+                    try
+                    {
+                        result.AppendLine(GetCpuRegisterPrintout(thread));
+                    }
+                    catch (Exception e)
+                    {
+                        result.AppendLine($"[Error getting registers: {e.Message}]");
+                    }
+                }
+            }
+            else
+            {
+                result.AppendLine("[Error generating minidump: debugInterface is null]");
+            }
+
+            result.AppendLine("=== End Minidump ===");
+
+            return result.ToString();
+        }
+
        private static bool TryGetSubName(Image image, ulong address, out ElfSymbol symbol)
        {
            address -= image.BaseAddress;
--- a/src/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs
@@ -889,7 +889,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
        [Svc(1)]
        public Result SetHeapSize([PointerSized] out ulong address, [PointerSized] ulong size)
        {
-            if ((size & 0xfffffffd001fffff) != 0)
+            if ((size & 0xfffffffc001fffff) != 0)
            {
                address = 0;

--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -221,10 +221,7 @@ namespace Ryujinx.Ava
            }

            // When you first load the program, copy to remember the path for the global configuration
-            if (GlobalConfigurationPath == null)
-            {
-                GlobalConfigurationPath = ConfigurationPath;
-            }
+            GlobalConfigurationPath ??= ConfigurationPath;

            UseHardwareAcceleration = ConfigurationState.Instance.EnableHardwareAcceleration;

--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -51,10 +51,10 @@
    <PackageReference Include="Avalonia.Diagnostics" Condition="'$(Configuration)'=='Debug'" />
    <PackageReference Include="Avalonia.Controls.DataGrid" />
    <PackageReference Include="Avalonia.Markup.Xaml.Loader" />
-    <PackageReference Include="Avalonia.Svg" />
-    <PackageReference Include="Avalonia.Svg.Skia" />
+    <PackageReference Include="Svg.Controls.Avalonia" />
+    <PackageReference Include="Svg.Controls.Skia.Avalonia" />
    <PackageReference Include="DynamicData" />
-    <PackageReference Include="FluentAvaloniaUI" />
+    <PackageReference Include="FluentAvaloniaUI.NoAnim" />
    <PackageReference Include="CommandLineParser" />
    <PackageReference Include="CommunityToolkit.Mvvm" />
    <PackageReference Include="DiscordRichPresence" />
--- a/src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs
+++ b/src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs
@@ -318,9 +318,9 @@ namespace Ryujinx.Ava.Systems.AppLibrary
                }
                catch (HorizonResultException)
                {
-                    foreach (DirectoryEntryEx entry in controlFs.EnumerateEntries("/", "*"))
+                    foreach (DirectoryEntryEx entry in controlFs.EnumerateEntries("/", "*", SearchOptions.Default))
                    {
-                        if (entry.Name == "control.nacp")
+                        if (entry.Name == "control.nacp" || entry.Type == DirectoryEntryType.Directory)
                        {
                            continue;
                        }
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
@@ -56,6 +56,7 @@ namespace Ryujinx.Ava.Systems.Configuration

            Logger.EnableFileLog.Value = cff.EnableFileLog;
            Logger.EnableDebug.Value = cff.LoggingEnableDebug;
+            Logger.EnableAvaloniaLog.Value = cff.LoggingEnableAvalonia;
            Logger.EnableStub.Value = cff.LoggingEnableStub;
            Logger.EnableInfo.Value = cff.LoggingEnableInfo;
            Logger.EnableWarn.Value = cff.LoggingEnableWarn;
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -176,7 +176,8 @@ namespace Ryujinx.Ava.UI.ViewModels
                .Sort(GetComparer())
                .OnItemAdded(_ => OnPropertyChanged(nameof(AppsObservableList)))
                .OnItemRemoved(_ => OnPropertyChanged(nameof(AppsObservableList)))
-                .Bind(out _appsObservableList);
+                .Bind(out _appsObservableList)
+                .Subscribe();

            _rendererWaitEvent = new AutoResetEvent(false);

--- a/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
@@ -35,18 +35,17 @@
                              Width="350"
                              ToolTip.Tip="{ext:Locale AudioBackendTooltip}"
                              HorizontalContentAlignment="Left">
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendDummy}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem IsEnabled="{Binding IsOpenAlEnabled}">
-                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendOpenAL}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem IsEnabled="{Binding IsSoundIoEnabled}">
-                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendSoundIO}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem IsEnabled="{Binding IsSDL2Enabled}">
-                            <TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendSDL2}" />
-                        </ComboBoxItem>
+                        <ComboBoxItem
+                            Content="{ext:Locale SettingsTabSystemAudioBackendDummy}" />
+                        <ComboBoxItem
+                            IsEnabled="{Binding IsOpenAlEnabled}"
+                            Content="{ext:Locale SettingsTabSystemAudioBackendOpenAL}" />
+                        <ComboBoxItem
+                            IsEnabled="{Binding IsSoundIoEnabled}"
+                            Content="{ext:Locale SettingsTabSystemAudioBackendSoundIO}" />
+                        <ComboBoxItem
+                            IsEnabled="{Binding IsSDL2Enabled}"
+                            Content="{ext:Locale SettingsTabSystemAudioBackendSDL2}" />
                    </ComboBox>
                </StackPanel>
                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
--- a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
@@ -55,19 +55,14 @@
                                  HorizontalContentAlignment="Left"
                                  Width="350">
                            <ComboBoxItem
-                                ToolTip.Tip="{ext:Locale MemoryManagerSoftwareTooltip}">
-                                <TextBlock
-                                    Text="{ext:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
-                            </ComboBoxItem>
+                                ToolTip.Tip="{ext:Locale MemoryManagerSoftwareTooltip}"
+                                Content="{ext:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
                            <ComboBoxItem
-                                ToolTip.Tip="{ext:Locale MemoryManagerHostTooltip}">
-                                <TextBlock Text="{ext:Locale SettingsTabSystemMemoryManagerModeHost}" />
-                            </ComboBoxItem>
+                                ToolTip.Tip="{ext:Locale MemoryManagerHostTooltip}"
+                                Content="{ext:Locale SettingsTabSystemMemoryManagerModeHost}" />
                            <ComboBoxItem
-                                ToolTip.Tip="{ext:Locale MemoryManagerUnsafeTooltip}">
-                                <TextBlock
-                                    Text="{ext:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
-                            </ComboBoxItem>
+                                ToolTip.Tip="{ext:Locale MemoryManagerUnsafeTooltip}"
+                                Content="{ext:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
                        </ComboBox>
                    </StackPanel>
                    <CheckBox IsChecked="{Binding UseHypervisor}"
--- a/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
@@ -37,12 +37,12 @@
                                HorizontalContentAlignment="Left"
                                ToolTip.Tip="{ext:Locale SettingsTabGraphicsBackendTooltip}"
                                SelectedIndex="{Binding GraphicsBackendIndex}">
-                            <ComboBoxItem IsVisible="{Binding IsVulkanAvailable}">
-                                <TextBlock Text="Vulkan" />
-                            </ComboBoxItem>
-                            <ComboBoxItem IsEnabled="{Binding IsOpenGLAvailable}">
-                                <TextBlock Text="OpenGL" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                IsVisible="{Binding IsVulkanAvailable}"
+                                Content="Vulkan" />
+                            <ComboBoxItem
+                                IsEnabled="{Binding IsOpenGLAvailable}"
+                                Content="OpenGL" />
                        </ComboBox>
                    </StackPanel>
                    <StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}">
@@ -65,15 +65,12 @@
                                      HorizontalContentAlignment="Left"
                                      ToolTip.Tip="{ext:Locale GalThreadingTooltip}"
                                      SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale CommonAuto}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale CommonOff}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale CommonOn}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{ext:Locale CommonAuto}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale CommonOff}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale CommonOn}" />
                            </ComboBox>
                        </StackPanel>
                    </StackPanel>
@@ -108,21 +105,16 @@
                                  Width="350"
                                  HorizontalContentAlignment="Left"
                                  ToolTip.Tip="{ext:Locale ResolutionScaleTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScaleNative}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale2x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale3x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale4x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScaleCustom}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsResolutionScaleNative}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsResolutionScale2x}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsResolutionScale3x}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsResolutionScale4x}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsResolutionScaleCustom}" />
                        </ComboBox>
                        <ui:NumberBox
                            Margin="10,0,0,0"
@@ -150,24 +142,18 @@
                                      HorizontalContentAlignment="Left"
                                      ToolTip.Tip="{ext:Locale GraphicsAATooltip}"
                                      SelectedIndex="{Binding AntiAliasingEffect}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="FXAA" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SmaaLow}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SmaaMedium}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SmaaHigh}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SmaaUltra}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
+                                <ComboBoxItem
+                                    Content="FXAA" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SmaaLow}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SmaaMedium}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SmaaHigh}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SmaaUltra}" />
                            </ComboBox>
                        </StackPanel>
                    </StackPanel>
@@ -184,18 +170,14 @@
                                      HorizontalContentAlignment="Left"
                                      ToolTip.Tip="{ext:Locale GraphicsScalingFilterTooltip}"
                                      SelectedIndex="{Binding ScalingFilter}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterBilinear}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterNearest}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterFsr}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale GraphicsScalingFilterArea}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{ext:Locale GraphicsScalingFilterBilinear}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale GraphicsScalingFilterNearest}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale GraphicsScalingFilterFsr}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale GraphicsScalingFilterArea}" />
                            </ComboBox>
                            <controls:SliderScroll Value="{Binding ScalingFilterLevel}"
                                    ToolTip.Tip="{ext:Locale GraphicsScalingFilterLevelTooltip}"
@@ -226,23 +208,16 @@
                                  Width="350"
                                  HorizontalContentAlignment="Left"
                                  ToolTip.Tip="{ext:Locale AnisotropyTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{ext:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
                        </ComboBox>
                    </StackPanel>
                    <StackPanel Orientation="Horizontal">
@@ -254,24 +229,18 @@
                                  Width="350"
                                  HorizontalContentAlignment="Left"
                                  ToolTip.Tip="{ext:Locale AspectRatioTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio4x3}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio16x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio16x10}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio21x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio32x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatioStretch}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAspectRatio4x3}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAspectRatio16x9}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAspectRatio16x10}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAspectRatio21x9}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAspectRatio32x9}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGraphicsAspectRatioStretch}" />
                        </ComboBox>
                    </StackPanel>
                </StackPanel>
--- a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
@@ -101,19 +101,14 @@
                                    Width="150"
                                    HorizontalContentAlignment="Left"
                                    ToolTip.Tip="{ext:Locale OpenGlLogLevel}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock
-                                        Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
                            </ComboBox>
                        </StackPanel>
                    </StackPanel>
--- a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
@@ -33,15 +33,12 @@
                        ToolTip.Tip="{ext:Locale MultiplayerModeTooltip}"
                        HorizontalContentAlignment="Left"
                        Width="250">
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale MultiplayerModeDisabled}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale MultiplayerModeLdnRyu}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale MultiplayerModeLdnMitm}" />
-                        </ComboBoxItem>
+                        <ComboBoxItem
+                            Content="{ext:Locale MultiplayerModeDisabled}" />
+                        <ComboBoxItem
+                            Content="{ext:Locale MultiplayerModeLdnRyu}" />
+                        <ComboBoxItem
+                            Content="{ext:Locale MultiplayerModeLdnMitm}" />
                    </ComboBox>
                    <CheckBox Margin="10,0,0,0" IsChecked="{Binding DisableP2P}">
                        <TextBlock Text="{ext:Locale MultiplayerDisableP2P}"
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -42,27 +42,20 @@
                            SelectedIndex="{Binding Region}"
                            HorizontalContentAlignment="Left"
                            Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionJapan}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionUSA}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionEurope}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionAustralia}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionChina}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionKorea}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionTaiwan}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionJapan}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionUSA}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionEurope}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionAustralia}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionChina}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionKorea}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemRegionTaiwan}" />
                        </ComboBox>
                    </StackPanel>
                    <StackPanel
@@ -76,60 +69,42 @@
                            SelectedIndex="{Binding Language}"
                            HorizontalContentAlignment="Left"
                            Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageJapanese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageFrench}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageGerman}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageItalian}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSpanish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageChinese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageKorean}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageDutch}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguagePortuguese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageRussian}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageJapanese}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageFrench}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageGerman}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageItalian}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageSpanish}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageChinese}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageKorean}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageDutch}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguagePortuguese}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageRussian}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                        </ComboBox>
                    </StackPanel>
                    <StackPanel
@@ -208,15 +183,12 @@
                            ToolTip.Tip="{ext:Locale SettingsTabSystemVSyncModeTooltipCustom}"
                            HorizontalContentAlignment="Left"
                            Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeCustom}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemVSyncModeCustom}" />
                        </ComboBox>
                        <ComboBox
                            IsVisible="{Binding !EnableCustomVSyncInterval}"
@@ -224,12 +196,10 @@
                            ToolTip.Tip="{ext:Locale SettingsTabSystemVSyncModeTooltip}"
                            HorizontalContentAlignment="Left"
                            Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
-                            </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
                        </ComboBox>
                    </StackPanel>
                    <StackPanel IsVisible="{Binding EnableCustomVSyncInterval}"
@@ -288,18 +258,14 @@
                        ToolTip.Tip="{ext:Locale DRamTooltip}"
                        HorizontalContentAlignment="Left"
                        Width="350">
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemDramSize4GiB}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemDramSize6GiB}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemDramSize8GiB}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem>
-                            <TextBlock Text="{ext:Locale SettingsTabSystemDramSize12GiB}" />
-                        </ComboBoxItem>
+                        <ComboBoxItem
+                            Content="{ext:Locale SettingsTabSystemDramSize4GiB}" />
+                        <ComboBoxItem
+                            Content="{ext:Locale SettingsTabSystemDramSize6GiB}" />
+                        <ComboBoxItem
+                            Content="{ext:Locale SettingsTabSystemDramSize8GiB}" />
+                        <ComboBoxItem
+                            Content="{ext:Locale SettingsTabSystemDramSize12GiB}" />
                    </ComboBox>
                </StackPanel>
                <StackPanel
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
@@ -71,22 +71,16 @@
                            <ComboBox SelectedIndex="{Binding FocusLostActionType}"
                                      HorizontalContentAlignment="Left"
                                      MinWidth="100">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeDoNothing}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInput}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock
-                                        Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralFocusLossTypeDoNothing}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInput}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
                            </ComboBox>
                        </StackPanel>
                        <StackPanel
@@ -100,16 +94,12 @@
                            <ComboBox SelectedIndex="{Binding UpdateCheckerType}"
                                      HorizontalContentAlignment="Left"
                                      MinWidth="100">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale CommonOff}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock
-                                        Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                    Content="{ext:Locale CommonOff}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
+                                <ComboBoxItem
+                                    Content="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
                            </ComboBox>
                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                        </StackPanel>
@@ -122,15 +112,12 @@
                            <ComboBox SelectedIndex="{Binding HideCursor}"
                                      HorizontalContentAlignment="Left"
                                      MinWidth="100">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale Never}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
-                                </ComboBoxItem>
+                            <ComboBoxItem
+                                Content="{ext:Locale Never}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
                            </ComboBox>
                        </StackPanel>
                        <StackPanel
@@ -145,15 +132,12 @@
                            <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
                                      HorizontalContentAlignment="Left"
                                      MinWidth="100">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale CommonAuto}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
-                                </ComboBoxItem>
+                                <ComboBoxItem
+                                Content="{ext:Locale CommonAuto}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGeneralThemeLight}" />
+                            <ComboBoxItem
+                                Content="{ext:Locale SettingsTabGeneralThemeDark}" />
                            </ComboBox>
                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                        </StackPanel>
--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
@@ -92,20 +92,24 @@
            Spacing="10">
            <Button
                Name="DeleteButton"
-                Click="DeleteButton_Click"
-                Content="{ext:Locale UserProfilesDelete}" />
+                Click="DeleteButton_Click">
+                <TextBlock Text="{ext:Locale UserProfilesDelete}" />
+            </Button>
            <Button
                Name="ChangePictureButton"
-                Click="ChangePictureButton_Click"
-                Content="{ext:Locale UserProfilesChangeProfileImage}" />
+                Click="ChangePictureButton_Click">
+                <TextBlock Text="{ext:Locale UserProfilesChangeProfileImage}" />
+            </Button>
            <Button
                Name="AddPictureButton"
-                Click="ChangePictureButton_Click"
-                Content="{ext:Locale UserProfilesSetProfileImage}" />
+                Click="ChangePictureButton_Click">
+                <TextBlock Text="{ext:Locale UserProfilesSetProfileImage}" />
+            </Button>
            <Button
                Name="SaveButton"
-                Click="SaveButton_Click"
-                Content="{ext:Locale Save}" />
+                Click="SaveButton_Click">
+                <TextBlock Text="{ext:Locale UserProfilesSetProfileImage}" />
+            </Button>
        </StackPanel>
    </Grid>
 </UserControl>
--- a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
@@ -22,44 +22,33 @@
    <Grid RowDefinitions="Auto,*,Auto">
        <Grid
            Grid.Row="0"
+            Margin="0,0,0,5"
            HorizontalAlignment="Stretch" ColumnDefinitions="Auto,*">
            <StackPanel
                Spacing="10"
                Orientation="Horizontal"
                HorizontalAlignment="Left"
                VerticalAlignment="Center">
-                <ComboBox SelectedIndex="{Binding SortIndex}" Width="100">
-                    <ComboBoxItem>
-                        <Label
-                            VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{ext:Locale Name}" />
-                    </ComboBoxItem>
-                    <ComboBoxItem>
-                        <Label
-                            VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{ext:Locale Size}" />
-                    </ComboBoxItem>
+                <ComboBox SelectedIndex="{Binding SortIndex}"
+                          HorizontalContentAlignment="Left"
+                          MinWidth="100">
+                    <ComboBoxItem
+                        Content="{ext:Locale Name}" />
+                    <ComboBoxItem
+                        Content="{ext:Locale Size}" />
                    <ComboBox.Styles>
                        <Style Selector="ContentControl#ContentPresenter">
                            <Setter Property="HorizontalAlignment" Value="Left" />
                        </Style>
                    </ComboBox.Styles>
                </ComboBox>
-                <ComboBox SelectedIndex="{Binding OrderIndex}" Width="150">
-                    <ComboBoxItem>
-                        <Label
-                            VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{ext:Locale OrderAscending}" />
-                    </ComboBoxItem>
-                    <ComboBoxItem>
-                        <Label
-                            VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{ext:Locale OrderDescending}" />
-                    </ComboBoxItem>
+                <ComboBox SelectedIndex="{Binding OrderIndex}"
+                          HorizontalContentAlignment="Left"
+                          MinWidth="150">
+                    <ComboBoxItem
+                        Content="{ext:Locale OrderAscending}" />
+                    <ComboBoxItem
+                        Content="{ext:Locale OrderDescending}" />
                    <ComboBox.Styles>
                        <Style Selector="ContentControl#ContentPresenter">
                            <Setter Property="HorizontalAlignment" Value="Left" />
@@ -71,9 +60,9 @@
                Grid.Column="1"
                HorizontalAlignment="Stretch"
                Margin="10,0, 0, 0" ColumnDefinitions="Auto,*">
-                <Label Content="{ext:Locale Search}" VerticalAlignment="Center" />
+                <TextBlock Text="{ext:Locale Search}" VerticalAlignment="Center" />
                <TextBox
-                    Margin="5,0,0,0"
+                    Margin="10,0,0,0"
                    Grid.Column="1"
                    HorizontalAlignment="Stretch"
                    Text="{Binding Search}" />
--- a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
@@ -136,11 +136,13 @@
            Orientation="Horizontal"
            Spacing="10">
            <Button
-                Click="ManageSaves"
-                Content="{ext:Locale UserProfilesManageSaves}" />
+                Click="ManageSaves">
+                <TextBlock Text="{ext:Locale UserProfilesManageSaves}" />
+            </Button>
            <Button
-                Click="RecoverLostAccounts"
-                Content="{ext:Locale UserProfilesRecoverLostAccounts}" />
+                Click="RecoverLostAccounts">
+                <TextBlock Text="{ext:Locale UserProfilesRecoverLostAccounts}" />
+            </Button>
        </StackPanel>
        <StackPanel
            Grid.Row="1"
@@ -148,8 +150,9 @@
            HorizontalAlignment="Right"
            Orientation="Horizontal">
            <Button
-                Click="Close"
-                Content="{ext:Locale UserProfilesClose}" />
+                Click="Close">
+                <TextBlock Text="{ext:Locale UserProfilesClose}" />
+            </Button>
        </StackPanel>
    </Grid>
 </UserControl>
Author	SHA1	Message	Date
KeatonTheBot	c6bc77e4bf	UI: Update Avalonia to 11.3.6, FluentAvalonia to 2.4.0 (ryubing/ryujinx!118 ) See merge request ryubing/ryujinx!118	2025-10-25 00:29:51 -05:00
GreemDev	49cbe4b328	UI: fix "Enable UI logs" not being persisted upon relaunch Closes ryujinx#5 (it was saved, just not loaded back)	2025-10-24 18:25:29 -05:00
Coxxs	6fd67cdcb7	Fix application list loads slowly when RyuLDN is enabled (ryubing/ryujinx!191 ) See merge request ryubing/ryujinx!191	2025-10-24 10:29:33 -05:00
LotP	5ced2bf764	fix wrong bit value (ryubing/ryujinx!190 ) See merge request ryubing/ryujinx!190	2025-10-24 10:10:31 -05:00
GreemDev	67e97d1a1a	gdb: YACC (yet another cleanup commit)	2025-10-23 19:11:58 -05:00
Coxxs	09d8a411c8	Do not RecurseSubdirectories when finding the icon fallback (ryubing/ryujinx!189 ) See merge request ryubing/ryujinx!189	2025-10-23 15:17:29 -05:00
Coxxs	93516df7e6	Skip directories when finding the icon fallback (ryubing/ryujinx!188 ) See merge request ryubing/ryujinx!188	2025-10-23 14:56:39 -05:00
Coxxs	0c165c3f62	Move ProcessInfo and Minidump to HleProcessDebugger (ryubing/ryujinx!187 ) See merge request ryubing/ryujinx!187	2025-10-22 16:20:13 -05:00
GreemDev	91da244c02	gdb: some more cleanups	2025-10-22 15:04:03 -05:00
GreemDev	904d4a7eb0	gdb: Make waiting for a process to start more forgiving (200ms per poll 10x -> 500ms)	2025-10-22 01:07:19 -05:00
Coxxs	1248a054de	gdb: Abort if unable to start GDB server (ryubing/ryujinx!186 ) See merge request ryubing/ryujinx!186	2025-10-21 23:16:18 -05:00