Merge branch 'master' into xeyes

Joy-Con is the official name

README.md

@@ -97,7 +97,7 @@ If you are planning to contribute or just want to learn more about this project
 
 - **Input**
 
-  We currently have support for keyboard, mouse, touch input, JoyCon input support, and nearly all controllers.
+  We currently have support for keyboard, mouse, touch input, Joy-Con input support, and nearly all controllers.
   Motion controls are natively supported in most cases; for dual-JoyCon motion support, DS4Windows or BetterJoy are currently required.
   In all scenarios, you can set up everything inside the input configuration menu.
 

src/Ryujinx.HLE/Loaders/Mods/MemPatch.cs

@@ -71,16 +71,24 @@ namespace Ryujinx.HLE.Loaders.Mods
                 int patchOffset = (int)offset;
                 int patchSize = patch.Length;
 
-                if (patchOffset < protectedOffset || patchOffset > memory.Length)
+                if (patchOffset < protectedOffset)
                 {
-                    continue; // Add warning?
+                    Logger.Warning?.Print(LogClass.ModLoader, $"Attempted to patch protected memory ({patchOffset:x} is within protected boundary of {protectedOffset:x}).");
+                    continue;
+                }
+                
+                if (patchOffset > memory.Length)
+                {
+                    Logger.Warning?.Print(LogClass.ModLoader, $"Attempted to patch out of bounds memory (offset {patchOffset} ({patchOffset:x}) exceeds memory buffer length {memory.Length}).");
+                    continue;
                 }
 
                 patchOffset -= protectedOffset;
 
                 if (patchOffset + patchSize > memory.Length)
                 {
-                    patchSize = memory.Length - patchOffset; // Add warning?
+                    Logger.Warning?.Print(LogClass.ModLoader, $"Patch offset ({patchOffset:x}) + size ({patchSize}) is greater than the size of the memory buffer ({memory.Length}). Attempting to fix this...");
+                    patchSize = memory.Length - patchOffset;
                 }
 
                 Logger.Info?.Print(LogClass.ModLoader, $"Patching address offset {patchOffset:x} <= {BitConverter.ToString(patch).Replace('-', ' ')} len={patchSize}");

src/Ryujinx/Assets/locales.json

@@ -464,7 +464,7 @@
         "pl_PL": "",
         "pt_BR": "Abrir Pasta de Capturas de Tela",
         "ru_RU": "Открыть папку со скриншотами",
-        "sv_SE": "",
+        "sv_SE": "Öppna skärmbildsmappen",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Відкрити теку скріншотів",
@@ -1564,7 +1564,7 @@
         "pl_PL": "",
         "pt_BR": "Desenvolvido por {0}",
         "ru_RU": "Разработана {0}",
-        "sv_SE": "",
+        "sv_SE": "Utvecklat av {0}",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Розроблено: {0}",
@@ -1864,7 +1864,7 @@
         "pl_PL": "",
         "pt_BR": "Compatibilidade:",
         "ru_RU": "Совместимость:",
-        "sv_SE": "",
+        "sv_SE": "Kompatibilitet:",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Сумісність:",
@@ -1889,7 +1889,7 @@
         "pl_PL": "",
         "pt_BR": "ID do Título:",
         "ru_RU": "ID приложения",
-        "sv_SE": "",
+        "sv_SE": "Titel-id:",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "ID гри:",
@@ -1914,7 +1914,7 @@
         "pl_PL": "",
         "pt_BR": "Jogos Hospedados: {0}",
         "ru_RU": "Запущенно игр: {0}",
-        "sv_SE": "",
+        "sv_SE": "Värdskap för spel: {0}",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Розміщені ігри: {0}",
@@ -1939,7 +1939,7 @@
         "pl_PL": "",
         "pt_BR": "Jogadores Online: {0}",
         "ru_RU": "Игроков онлайн: {0}",
-        "sv_SE": "",
+        "sv_SE": "Online-spelare: {0}",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Гравців онлайн: {0}",
@@ -2289,7 +2289,7 @@
         "pl_PL": "",
         "pt_BR": "Limpar Cache PPTC",
         "ru_RU": "Очистить кэш PPTC",
-        "sv_SE": "",
+        "sv_SE": "Rensa PPTC-cache",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Очистити кеш PPTC",
@@ -2314,7 +2314,7 @@
         "pl_PL": "",
         "pt_BR": "Apaga os arquivos de cache PPTC do aplicativo",
         "ru_RU": "Удаляет все файлы кэша PPTC для приложения",
-        "sv_SE": "",
+        "sv_SE": "Tar bort alla PPTC-cachefiler för applikationen",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Видаляє всі файли кешу PPTC для застосунку",
@@ -2889,7 +2889,7 @@
         "pl_PL": "",
         "pt_BR": "Mostrar Dados de Compatibilidade",
         "ru_RU": "Показать записи о совместимости",
-        "sv_SE": "",
+        "sv_SE": "Visa kompatibilitetspost",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Iнформація про сумісність",
@@ -2914,7 +2914,7 @@
         "pl_PL": "",
         "pt_BR": "Exibe o jogo selecionado na Lista de Compatibilidade, que normalmente pode ser acessada pelo menu Ajuda.",
         "ru_RU": "Отобразить выбранную игру в списке совместимости, доступ к которому вы обычно можете получить через меню Справки.",
-        "sv_SE": "",
+        "sv_SE": "Visa valt spel i kompatibilitetslistan som du normalt sett kan komma åt via hjälpmenyn.",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Показати цю гру в Списку Сумісності. Список сумісності також можна зайти в меню Довідки.",
@@ -2939,7 +2939,7 @@
         "pl_PL": "",
         "pt_BR": "Mostrar Informações do Jogo",
         "ru_RU": "Показать информацию об игре",
-        "sv_SE": "",
+        "sv_SE": "Visa spelinformation",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Інформація про гру",
@@ -2964,7 +2964,7 @@
         "pl_PL": "",
         "pt_BR": "Exibe estatísticas e detalhes sobre o jogo selecionado.",
         "ru_RU": "Показывать статистику и подробную информацию о выбранной игре.",
-        "sv_SE": "",
+        "sv_SE": "Visa statistik och detaljer om det aktuella spelet.",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Показати статистику та деталі обраної гри.",
@@ -3514,7 +3514,7 @@
         "pl_PL": "",
         "pt_BR": "Verificar Atualizações:",
         "ru_RU": "Проверка наличия обновлений",
-        "sv_SE": "",
+        "sv_SE": "Leta efter uppdateringar:",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Перевірка оновлень:",
@@ -3539,7 +3539,7 @@
         "pl_PL": "",
         "pt_BR": "Desligado",
         "ru_RU": "Отключить",
-        "sv_SE": "",
+        "sv_SE": "Av",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Вимкнути",
@@ -3564,7 +3564,7 @@
         "pl_PL": "",
         "pt_BR": "Ao Abrir",
         "ru_RU": "При запуске",
-        "sv_SE": "",
+        "sv_SE": "Fråga",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Запитувати щоразу",
@@ -3589,7 +3589,7 @@
         "pl_PL": "",
         "pt_BR": "2° Plano",
         "ru_RU": "В фоне",
-        "sv_SE": "",
+        "sv_SE": "Bakgrund",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Оновлювати в фоні",
@@ -3614,7 +3614,7 @@
         "pl_PL": "",
         "pt_BR": "Ao Perder o Foco:",
         "ru_RU": "При выходе эмулятора из фокуса",
-        "sv_SE": "",
+        "sv_SE": "När emulatorn tappar fokus:",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "При втраті фокуса емулятором:",
@@ -3639,7 +3639,7 @@
         "pl_PL": "",
         "pt_BR": "Não Fazer Nada",
         "ru_RU": "Ничего не делать",
-        "sv_SE": "",
+        "sv_SE": "Gör ingenting",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Нічого не робити",
@@ -3664,7 +3664,7 @@
         "pl_PL": "",
         "pt_BR": "Bloquear Controles",
         "ru_RU": "Блокировать управление",
-        "sv_SE": "",
+        "sv_SE": "Blockera inmatning",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Блокувати введення",
@@ -3689,7 +3689,7 @@
         "pl_PL": "",
         "pt_BR": "Ficar Mudo",
         "ru_RU": "Отключить звук",
-        "sv_SE": "",
+        "sv_SE": "Stäng av ljudet",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Вимкнути звук",
@@ -3714,7 +3714,7 @@
         "pl_PL": "",
         "pt_BR": "Bloquear Controles & Ficar Mudo",
         "ru_RU": "Блокировать управление и отключить звук",
-        "sv_SE": "",
+        "sv_SE": "Blockera inmatningar och stäng av ljudet",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Блокувати введення та Вимкнути звук",
@@ -3739,7 +3739,7 @@
         "pl_PL": "",
         "pt_BR": "Pausar a Emulação",
         "ru_RU": "Поставить паузу",
-        "sv_SE": "",
+        "sv_SE": "Pausa emuleringen",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Поставити на паузу",
@@ -3814,7 +3814,7 @@
         "pl_PL": "",
         "pt_BR": "Desativar Controles Quando Estiver Fora de Foco",
         "ru_RU": "Отключает управление при выходе из фокуса",
-        "sv_SE": "",
+        "sv_SE": "Inaktivera inmatning när fokus tappas",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -4839,7 +4839,7 @@
         "pl_PL": "",
         "pt_BR": "Sincronizar com o Sistema PC",
         "ru_RU": "Соответствовать времени в системе",
-        "sv_SE": "",
+        "sv_SE": "Matcha systemtid",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -5264,7 +5264,7 @@
         "pl_PL": "",
         "pt_BR": "Ignorar Applet do Controlador",
         "ru_RU": "Игнорировать апплет контроллера",
-        "sv_SE": "",
+        "sv_SE": "Ignorera kontroller-applet",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Ігнорувати Аплет Контролера",
@@ -6114,7 +6114,7 @@
         "pl_PL": "",
         "pt_BR": "Habilitar Logs da IU",
         "ru_RU": "Включить журнал интерфейса",
-        "sv_SE": "",
+        "sv_SE": "Aktivera gränssnittsloggar",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Увімкнути журнали інтерфейсу",
@@ -6514,7 +6514,7 @@
         "pl_PL": "",
         "pt_BR": "Redefinir Configurações",
         "ru_RU": "Сбросить настройки",
-        "sv_SE": "",
+        "sv_SE": "Nollställ inställningar",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Скинути налаштування",
@@ -6539,7 +6539,7 @@
         "pl_PL": "",
         "pt_BR": "Quero redefinir minhas configurações.",
         "ru_RU": "Я хочу сбросить свои настройки.",
-        "sv_SE": "",
+        "sv_SE": "Jag vill nollställa mina inställningar.",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Я хочу скинути налаштування.",
@@ -8514,7 +8514,7 @@
         "pl_PL": "",
         "pt_BR": "Velocidade do Arco-íris",
         "ru_RU": "Скорость переливания",
-        "sv_SE": "",
+        "sv_SE": "Regnbågshastighet",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -13814,7 +13814,7 @@
         "pl_PL": "",
         "pt_BR": "Você está prestes a limpar todos os dados PPTC de:\n\n{0}\n\nTem certeza de que deseja continuar?",
         "ru_RU": "Вы собираетесь удалить все данные PPTC из:\n\n{0}\n\nВы уверены, что хотите продолжить?",
-        "sv_SE": "",
+        "sv_SE": "Du är på väg att ta bort allt PPTC-data från:\n\n{0}\n\nÄr du säker på att du vill fortsätta?",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Ви збираєтесь видалити всі дані PPTC з:\n\n{0}\n\nБажаєте продовжити цю операцію?",
@@ -16664,7 +16664,7 @@
         "pl_PL": "",
         "pt_BR": "A caixa de diálogo do Applet do controlador não aparecerá se o controle for desconectado enquanto um aplicativo estiver em execução.\n\nDeixe a opção DESLIGADO se não tiver certeza.",
         "ru_RU": "Диалоговое окно апплета контроллера не будет отображаться, если геймпад отключен во время работы приложения.\n\nОставьте выключенным, если не уверены.",
-        "sv_SE": "",
+        "sv_SE": "Handkontroller-appleten kommer inte att visas om gamepaden är frånkopplad under tiden en applikation körs.\n\nLämna AV om du är osäker.",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Діалогове вікно Аплету Контролера не з'явиться, якщо геймпад було відключено під час роботи програми.\n\nЗалиште вимкненим якщо не впевнені.",
@@ -17139,7 +17139,7 @@
         "pl_PL": "",
         "pt_BR": "Imprime mensagens de log do Avalonia (UI) no console.",
         "ru_RU": "Выводит сообщения журнала Avalonia (интерфейс) в консоли.",
-        "sv_SE": "",
+        "sv_SE": "Skriver ut loggmeddelanden från Avalonia (användargränssnittet) i konsollen.",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Виводити повідомлення журналу Avalonia (UI) в консоль",
@@ -17339,7 +17339,7 @@
         "pl_PL": "",
         "pt_BR": "Abre a pasta de capturas de tela do Ryujinx",
         "ru_RU": "Открывает папку скриншотов Ryujinx",
-        "sv_SE": "",
+        "sv_SE": "Öppna Ryujinx skärmbildsmapp",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Відкрити теку куди зберігаються скріншоти Ryujinx",
@@ -18089,7 +18089,7 @@
         "pl_PL": "",
         "pt_BR": "Atualização Disponível!",
         "ru_RU": "Доступно обновление!",
-        "sv_SE": "",
+        "sv_SE": "Uppdatering finns tillgänglig!",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Доступне оновлення!",
@@ -24064,7 +24064,7 @@
         "pl_PL": "",
         "pt_BR": "Inicializa e roda sem travamentos ou bugs de GPU de qualquer tipo, e em uma velocidade rápida o suficiente para ser aproveitado em um PC comum.",
         "ru_RU": "Запускается и работает без любого рода сбоев или графисечких ошибок и на скорости, достаточной для работы на обычном ПК.",
-        "sv_SE": "",
+        "sv_SE": "Startar upp och spelas utan några krascher eller GPU-fel av några slag och med en hastighet som är snabb nog för bra upplevelse på en genomsnittlig PC.",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Запускається та оптимально працює (без збоїв або графічних багів) на середньостатистичному комп'ютері.",
@@ -24089,7 +24089,7 @@
         "pl_PL": "",
         "pt_BR": "Inicializa e entra no jogo, mas sofre de um ou mais dos seguintes: travamentos, deadlocks, bugs de GPU, áudio ruim que distrai ou é simplesmente muito lento. O jogo ainda pode ser jogado até o fim, mas não da forma como foi criado para ser jogado.",
         "ru_RU": "Запускается и работает, но возникает одна или несколько из следующих проблем: сбои, взаимоблокировки, ошибки GPU, отвлекающие звуки или просто слишком медленная работа. Возможно, игру всё же удастся пройти до конца, но не так, как она задумана.",
-        "sv_SE": "",
+        "sv_SE": "Startar och går in i spelet men lider av ett eller flera av följande: kraschar, deadlocks, GPU-buggar, distraherande dåligt ljud eller är helt enkelt för långsamt. Spelet kan fortfarande spelas hela vägen igenom, men inte så som spelet är avsett att spelas.",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Запускається, але в грі на вас чекатимуть одна або декілька наступних проблем: збої, зависання, графічні баги, спотворений звук або ж гра загалом працюватиме надто повільно. Можливо, її все ще можна пройти, але досвід буде не найкращим.",
@@ -24114,7 +24114,7 @@
         "pl_PL": "",
         "pt_BR": "Inicializa e passa da tela de título, mas não entra no jogo principal.",
         "ru_RU": "Загружается титульный экран и можно перейти дальше, но сама игра не работает.",
-        "sv_SE": "",
+        "sv_SE": "Startar upp och går förbi titelskärmen men tar sig inte in i huvudspelet.",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Запускається та проходить початковий екран, але пограти не вийде.",
@@ -24139,7 +24139,7 @@
         "pl_PL": "",
         "pt_BR": "Inizializa, mas não passa da tela de título.",
         "ru_RU": "Загружается, но не проходит дальше титульного экрана.",
-        "sv_SE": "",
+        "sv_SE": "Startar upp men tar sig inte förbi titelskärmen.",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Запускається, але не відображає навіть початкового екрану.",
@@ -24164,7 +24164,7 @@
         "pl_PL": "",
         "pt_BR": "Não inicializa ou não mostra sinais de atividade.",
         "ru_RU": "Не запускается или не подаёт признаков жизни.",
-        "sv_SE": "",
+        "sv_SE": "Startar inte upp eller visar någon form av aktivitet.",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Взагалі не запускається.",
@@ -24264,7 +24264,7 @@
         "pl_PL": "",
         "pt_BR": "Imagem da Presença do Discord",
         "ru_RU": "Изображение для статуса активности",
-        "sv_SE": "",
+        "sv_SE": "Bild för Rich Presence",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Зображення картки активності Discord",
@@ -24289,7 +24289,7 @@
         "pl_PL": "",
         "pt_BR": "Presença Dinâmica do Discord",
         "ru_RU": "Динамический статус активности",
-        "sv_SE": "",
+        "sv_SE": "Dynamisk Rich Presence",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Динамічна картка активності Discord",

src/Ryujinx/Program.cs

@@ -158,16 +158,6 @@ namespace Ryujinx.Ava
             }
         }
 
-        public static bool FindGameConfig(string gameDir)
-        {
-            if (File.Exists(gameDir))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
         public static string GetDirGameUserConfig(string gameId, bool rememberGlobalDir = false, bool changeFolderForGame = false)
         {
             if (string.IsNullOrEmpty(gameId))

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -95,7 +95,7 @@ namespace Ryujinx.Ava.UI.Applet
                             _parent.SettingsWindow =
                                 new SettingsWindow(_parent.VirtualFileSystem, _parent.ContentManager);
 
-                            await _parent.SettingsWindow.ShowDialog(window);
+                            await StyleableAppWindow.ShowAsync(_parent.SettingsWindow, window);
 
                             _parent.SettingsWindow = null;
 

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

@@ -91,11 +91,14 @@ namespace Ryujinx.Ava.UI.Controls
         public async void OpenCheatManager_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await new CheatWindow(
-                    viewModel.VirtualFileSystem,
-                    viewModel.SelectedApplication.IdString,
-                    viewModel.SelectedApplication.Name,
-                    viewModel.SelectedApplication.Path).ShowDialog((Window)viewModel.TopLevel);
+                await StyleableAppWindow.ShowAsync(
+                    new CheatWindow(
+                        viewModel.VirtualFileSystem,
+                        viewModel.SelectedApplication.IdString,
+                        viewModel.SelectedApplication.Name,
+                        viewModel.SelectedApplication.Path
+                    )
+                );
         }
 
         public void OpenModsDirectory_Click(object sender, RoutedEventArgs args)
@@ -391,9 +394,9 @@ namespace Ryujinx.Ava.UI.Controls
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
             {
-                await new GameSpecificSettingsWindow(viewModel).ShowDialog((Window)viewModel.TopLevel);
+                await StyleableAppWindow.ShowAsync(new GameSpecificSettingsWindow(viewModel));
 
-                //just checking for file presence
+                // just checking for file presence
                 viewModel.SelectedApplication.HasIndependentConfiguration = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString,false,false));
 
                 viewModel.RefreshView();

src/Ryujinx/UI/Helpers/ContentDialogHelper.cs

@@ -1,6 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Threading;
@@ -384,6 +385,10 @@ namespace Ryujinx.Ava.UI.Helpers
                     Position = parent.PointToScreen(new Point()),
                     ShowInTaskbar = false,
                 };
+                
+#if DEBUG
+                _contentDialogOverlayWindow.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Control));
+#endif
 
                 parent.PositionChanged += OverlayOnPositionChanged;
 

src/Ryujinx/UI/Models/Input/StickVisualizer.cs

@@ -0,0 +1,260 @@
+using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.ViewModels.Input;
+using Ryujinx.Input;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.UI.Models.Input
+{
+    public class StickVisualizer : BaseModel, IDisposable
+    {
+        public const int DrawStickPollRate = 50; // Milliseconds per poll.
+        public const int DrawStickCircumference = 5;
+        public const float DrawStickScaleFactor = DrawStickCanvasCenter;
+        public const int DrawStickCanvasSize = 100;
+        public const int DrawStickBorderSize = DrawStickCanvasSize + 5;
+        public const float DrawStickCanvasCenter = (DrawStickCanvasSize - DrawStickCircumference) / 2;
+        public const float MaxVectorLength = DrawStickCanvasSize / 2;
+
+        public CancellationTokenSource PollTokenSource;
+        public CancellationToken PollToken;
+
+        private static float _vectorLength;
+        private static float _vectorMultiplier;
+
+        private bool disposedValue;
+
+        private DeviceType _type;
+        public DeviceType Type
+        {
+            get => _type;
+            set
+            {
+                _type = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        private GamepadInputConfig _gamepadConfig;
+        public GamepadInputConfig GamepadConfig
+        {
+            get => _gamepadConfig;
+            set
+            {
+                _gamepadConfig = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        private KeyboardInputConfig _keyboardConfig;
+        public KeyboardInputConfig KeyboardConfig
+        {
+            get => _keyboardConfig;
+            set
+            {
+                _keyboardConfig = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        private (float, float) _uiStickLeft;
+        public (float, float) UiStickLeft
+        {
+            get => (_uiStickLeft.Item1 * DrawStickScaleFactor, _uiStickLeft.Item2 * DrawStickScaleFactor);
+            set
+            {
+                _uiStickLeft = value;
+
+                OnPropertyChanged();
+                OnPropertyChanged(nameof(UiStickRightX));
+                OnPropertyChanged(nameof(UiStickRightY));
+                OnPropertyChanged(nameof(UiDeadzoneRight));
+            }
+        }
+
+        private (float, float) _uiStickRight;
+        public (float, float) UiStickRight
+        {
+            get => (_uiStickRight.Item1 * DrawStickScaleFactor, _uiStickRight.Item2 * DrawStickScaleFactor);
+            set
+            {
+                _uiStickRight = value;
+
+                OnPropertyChanged();
+                OnPropertyChanged(nameof(UiStickLeftX));
+                OnPropertyChanged(nameof(UiStickLeftY));
+                OnPropertyChanged(nameof(UiDeadzoneLeft));
+            }
+        }
+
+        public float UiStickLeftX => ClampVector(UiStickLeft).Item1;
+        public float UiStickLeftY => ClampVector(UiStickLeft).Item2;
+        public float UiStickRightX => ClampVector(UiStickRight).Item1;
+        public float UiStickRightY => ClampVector(UiStickRight).Item2;
+
+        public int UiStickCircumference => DrawStickCircumference;
+        public int UiCanvasSize => DrawStickCanvasSize;
+        public int UiStickBorderSize => DrawStickBorderSize;
+
+        public float? UiDeadzoneLeft => _gamepadConfig?.DeadzoneLeft * DrawStickCanvasSize - DrawStickCircumference;
+        public float? UiDeadzoneRight => _gamepadConfig?.DeadzoneRight * DrawStickCanvasSize - DrawStickCircumference;
+
+        private InputViewModel Parent;
+
+        public StickVisualizer(InputViewModel parent)
+        {
+            Parent = parent;
+
+            PollTokenSource = new CancellationTokenSource();
+            PollToken = PollTokenSource.Token;
+
+            Task.Run(Initialize, PollToken);
+        }
+
+        public void UpdateConfig(object config)
+        {
+            if (config is ControllerInputViewModel padConfig)
+            {
+                GamepadConfig = padConfig.Config;
+                Type = DeviceType.Controller;
+
+                return;
+            }
+            else if (config is KeyboardInputViewModel keyConfig)
+            {
+                KeyboardConfig = keyConfig.Config;
+                Type = DeviceType.Keyboard;
+
+                return;
+            }
+
+            Type = DeviceType.None;
+        }
+
+        public async Task Initialize()
+        {
+            (float, float) leftBuffer;
+            (float, float) rightBuffer;
+
+            while (!PollToken.IsCancellationRequested)
+            {
+                leftBuffer = (0f, 0f);
+                rightBuffer = (0f, 0f);
+
+                switch (Type)
+                {
+                    case DeviceType.Keyboard:
+                        IKeyboard keyboard = (IKeyboard)Parent.AvaloniaKeyboardDriver.GetGamepad("0");
+
+                        if (keyboard != null)
+                        {
+                            KeyboardStateSnapshot snapshot = keyboard.GetKeyboardStateSnapshot();
+
+                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickRight))
+                            {
+                                leftBuffer.Item1 += 1;
+                            }
+                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickLeft))
+                            {
+                                leftBuffer.Item1 -= 1;
+                            }
+                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickUp))
+                            {
+                                leftBuffer.Item2 += 1;
+                            }
+                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickDown))
+                            {
+                                leftBuffer.Item2 -= 1;
+                            }
+
+                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickRight))
+                            {
+                                rightBuffer.Item1 += 1;
+                            }
+                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickLeft))
+                            {
+                                rightBuffer.Item1 -= 1;
+                            }
+                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickUp))
+                            {
+                                rightBuffer.Item2 += 1;
+                            }
+                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickDown))
+                            {
+                                rightBuffer.Item2 -= 1;
+                            }
+
+                            UiStickLeft = leftBuffer;
+                            UiStickRight = rightBuffer;
+                        }
+                        break;
+
+                    case DeviceType.Controller:
+                        IGamepad controller = Parent.SelectedGamepad;
+
+                        if (controller != null)
+                        {
+                            leftBuffer = controller.GetStick((StickInputId)GamepadConfig.LeftJoystick);
+                            rightBuffer = controller.GetStick((StickInputId)GamepadConfig.RightJoystick);
+                        }
+                        break;
+
+                    case DeviceType.None:
+                        break;
+                    default:
+                        throw new ArgumentException($"Unable to poll device type \"{Type}\"");
+                }
+
+                UiStickLeft = leftBuffer;
+                UiStickRight = rightBuffer;
+
+                await Task.Delay(DrawStickPollRate, PollToken);
+            }
+
+            PollTokenSource.Dispose();
+        }
+
+        public static (float, float) ClampVector((float, float) vect)
+        {
+            _vectorMultiplier = 1;
+            _vectorLength = MathF.Sqrt((vect.Item1 * vect.Item1) + (vect.Item2 * vect.Item2));
+
+            if (_vectorLength > MaxVectorLength)
+            {
+                _vectorMultiplier = MaxVectorLength / _vectorLength;
+            }
+
+            vect.Item1 = vect.Item1 * _vectorMultiplier + DrawStickCanvasCenter;
+            vect.Item2 = vect.Item2 * _vectorMultiplier + DrawStickCanvasCenter;
+
+            return vect;
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    PollTokenSource.Cancel();
+                }
+
+                KeyboardConfig = null;
+                GamepadConfig = null;
+                Parent = null;
+
+                disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+    }
+}

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

@@ -1,5 +1,9 @@
 using Avalonia.Svg.Skia;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava.Input;
+using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Views.Input;
 using Ryujinx.Common.Utilities;
@@ -10,8 +14,30 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 {
     public partial class ControllerInputViewModel : BaseModel
     {
-        [ObservableProperty] private GamepadInputConfig _config;
+        private GamepadInputConfig _config;
+        public GamepadInputConfig Config
+        {
+            get => _config;
+            set
+            {
+                _config = value;
 
+                OnPropertyChanged();
+            }
+        }
+
+        private StickVisualizer _visualizer;
+        public StickVisualizer Visualizer
+        {
+            get => _visualizer;
+            set
+            {
+                _visualizer = value;
+
+                OnPropertyChanged();
+            }
+        }
+        
         private bool _isLeft;
         public bool IsLeft
         {
@@ -37,14 +63,15 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         }
 
         public bool HasSides => IsLeft ^ IsRight;
-
+        
         [ObservableProperty] private SvgImage _image;
-
+        
         public InputViewModel ParentModel { get; }
-
-        public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config)
+        
+        public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config, StickVisualizer visualizer)
         {
             ParentModel = model;
+            Visualizer = visualizer;
             model.NotifyChangesEvent += OnParentModelChanged;
             OnParentModelChanged();
             config.PropertyChanged += (_, args) =>

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

@@ -49,7 +49,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         private int _controller;
         private string _controllerImage;
         private int _device;
-        [ObservableProperty] private object _configViewModel;
+        private object _configViewModel;
         [ObservableProperty] private string _profileName;
         private bool _isLoaded;
 
@@ -74,6 +74,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 OnPropertiesChanged(nameof(HasLed), nameof(CanClearLed));
             }
         }
+        public StickVisualizer VisualStick { get; private set; }
 
         public ObservableCollection<PlayerModel> PlayerIndexes { get; set; }
         public ObservableCollection<(DeviceType Type, string Id, string Name)> Devices { get; set; }
@@ -94,6 +95,19 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsModified { get; set; }
         public event Action NotifyChangesEvent;
 
+        public object ConfigViewModel
+        {
+            get => _configViewModel;
+            set
+            {
+                _configViewModel = value;
+
+                VisualStick.UpdateConfig(value);
+
+                OnPropertyChanged();
+            }
+        }
+
         public PlayerIndex PlayerIdChoose
         {
             get => _playerIdChoose;
@@ -269,6 +283,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             Devices = [];
             ProfilesList = [];
             DeviceList = [];
+            VisualStick = new StickVisualizer(this);
 
             ControllerImage = ProControllerResource;
 
@@ -289,12 +304,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
             if (Config is StandardKeyboardInputConfig keyboardInputConfig)
             {
-                ConfigViewModel = new KeyboardInputViewModel(this, new KeyboardInputConfig(keyboardInputConfig));
+                ConfigViewModel = new KeyboardInputViewModel(this, new KeyboardInputConfig(keyboardInputConfig), VisualStick);
             }
 
             if (Config is StandardControllerInputConfig controllerInputConfig)
             {
-                ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig));
+                ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig), VisualStick);
             }
         }
 
@@ -893,6 +908,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
             _mainWindow.ViewModel.AppHost?.NpadManager.UnblockInputUpdates();
 
+            VisualStick.Dispose();
+
             SelectedGamepad?.Dispose();
 
             AvaloniaKeyboardDriver.Dispose();

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

@@ -6,7 +6,29 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 {
     public partial class KeyboardInputViewModel : BaseModel
     {
-        [ObservableProperty] private KeyboardInputConfig _config;
+        private KeyboardInputConfig _config;
+        public KeyboardInputConfig Config
+        {
+            get => _config;
+            set
+            {
+                _config = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        private StickVisualizer _visualizer;
+        public StickVisualizer Visualizer
+        {
+            get => _visualizer;
+            set
+            {
+                _visualizer = value;
+
+                OnPropertyChanged();
+            }
+        }
 
         private bool _isLeft;
         public bool IsLeft
@@ -38,9 +60,10 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public readonly InputViewModel ParentModel;
 
-        public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config)
+        public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config, StickVisualizer visualizer)
         {
             ParentModel = model;
+            Visualizer = visualizer;
             model.NotifyChangesEvent += OnParentModelChanged;
             OnParentModelChanged();
             Config = config;

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -1747,7 +1747,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 string titleId = AppHost.Device.Processes.ActiveApplication.ProgramIdText.ToUpper();
                 AmiiboWindow window = new(ShowAll, LastScannedAmiiboId, titleId);
 
-                await window.ShowDialog(Window);
+                await StyleableAppWindow.ShowAsync(window);
 
                 if (window.IsScanned)
                 {

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml

@@ -316,17 +316,103 @@
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch">
                 <!-- Controller Picture -->
-                <Image
-                    Margin="0,10"
-                    MaxHeight="300"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Source="{Binding Image}" />
                 <Border
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"
                     CornerRadius="5"
+                    Margin="0,10"
                     MinHeight="90">
+                    <StackPanel Orientation="Vertical">
+                        <Image
+                            Margin="5,10"
+                            MaxHeight="300"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Source="{Binding Image}" />
+                        <StackPanel
+                            Margin="10"
+                            Orientation="Horizontal"
+                            Spacing="20"
+                            HorizontalAlignment="Center">
+                            <Border
+                                BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                                BorderThickness="1"
+                                CornerRadius="5"
+                                Height="{Binding Visualizer.UiStickBorderSize}"
+                                Width="{Binding Visualizer.UiStickBorderSize}"
+                                IsVisible="{Binding IsLeft}">
+                                <Canvas
+                                    Background="{DynamicResource ThemeBackgroundColor}"
+                                    Height="{Binding Visualizer.UiCanvasSize}"
+                                    Width="{Binding Visualizer.UiCanvasSize}">
+                                    <Grid
+                                        Height="{Binding Visualizer.UiCanvasSize}"
+                                        Width="{Binding Visualizer.UiCanvasSize}"
+                                        Background="{DynamicResource ThemeBackgroundColor}">
+                                        <Ellipse
+                                            HorizontalAlignment="Center"
+                                            Stroke="Black"
+                                            StrokeThickness="1"
+                                            Width="{Binding Visualizer.UiCanvasSize}"
+                                            Height="{Binding Visualizer.UiCanvasSize}" />
+                                        <Ellipse
+                                            HorizontalAlignment="Center"
+                                            Fill="Gray"
+                                            Opacity="100"
+                                            Height="{Binding Visualizer.UiDeadzoneLeft}"
+                                            Width="{Binding Visualizer.UiDeadzoneLeft}" />
+                                    </Grid>
+                                    <Ellipse
+                                        Fill="Red"
+                                        Width="{Binding Visualizer.UiStickCircumference}"
+                                        Height="{Binding Visualizer.UiStickCircumference}"
+                                        Canvas.Bottom="{Binding Visualizer.UiStickLeftY}"
+                                        Canvas.Left="{Binding Visualizer.UiStickLeftX}" />
+                                </Canvas>
+                            </Border>
+                            <Border
+                                BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                                BorderThickness="1"
+                                CornerRadius="5"
+                                Height="{Binding Visualizer.UiStickBorderSize}"
+                                Width="{Binding Visualizer.UiStickBorderSize}"
+                                IsVisible="{Binding IsRight}">
+                                <Canvas
+                                    Background="{DynamicResource ThemeBackgroundColor}"
+                                    Height="{Binding Visualizer.UiCanvasSize}"
+                                    Width="{Binding Visualizer.UiCanvasSize}">
+                                    <Grid
+                                        Height="{Binding Visualizer.UiCanvasSize}"
+                                        Width="{Binding Visualizer.UiCanvasSize}"
+                                        Background="{DynamicResource ThemeBackgroundColor}">
+                                        <Ellipse
+                                            HorizontalAlignment="Center"
+                                            Stroke="Black"
+                                            StrokeThickness="1"
+                                            Width="{Binding Visualizer.UiCanvasSize}"
+                                            Height="{Binding Visualizer.UiCanvasSize}" />
+                                        <Ellipse
+                                            HorizontalAlignment="Center"
+                                            Fill="Gray"
+                                            Opacity="100"
+                                            Height="{Binding Visualizer.UiDeadzoneRight}"
+                                            Width="{Binding Visualizer.UiDeadzoneRight}" />
+                                    </Grid>
+                                    <Ellipse
+                                        Fill="Red"
+                                        Width="{Binding Visualizer.UiStickCircumference}"
+                                        Height="{Binding Visualizer.UiStickCircumference}"
+                                        Canvas.Bottom="{Binding Visualizer.UiStickRightY}"
+                                        Canvas.Left="{Binding Visualizer.UiStickRightX}" />
+                                </Canvas>
+                            </Border>
+                        </StackPanel>
+                    </StackPanel>
+                </Border>
+                <Border
+                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                    BorderThickness="1"
+                    CornerRadius="5">
                     <StackPanel
                         Margin="8"
                         Orientation="Vertical">
@@ -345,8 +431,8 @@
                                 Minimum="0"
                                 Value="{Binding Config.TriggerThreshold, Mode=TwoWay}" />
                             <TextBlock
-                              Width="25"
-                              Text="{Binding Config.TriggerThreshold, StringFormat=\{0:0.00\}}" />
+                                Width="25"
+                                Text="{Binding Config.TriggerThreshold, StringFormat=\{0:0.00\}}" />
                         </StackPanel>
                         <StackPanel
                             Orientation="Vertical"

src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml

@@ -309,12 +309,79 @@
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch">
                 <!-- Controller Picture -->
-                <Image
+                <Border
+                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                    BorderThickness="1"
+                    CornerRadius="5"
                     Margin="0,10"
-                    MaxHeight="300"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Source="{Binding Image}" />
+                    MinHeight="90">
+                    <StackPanel
+                        Margin="10"
+                        Orientation="Horizontal"
+                        Spacing="20"
+                        HorizontalAlignment="Center">
+                        <Border
+                            BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                            BorderThickness="1"
+                            CornerRadius="5"
+                            Height="{Binding Visualizer.UiStickBorderSize}"
+                            Width="{Binding Visualizer.UiStickBorderSize}"
+                            IsVisible="{Binding IsLeft}">
+                            <Canvas
+                                Background="{DynamicResource ThemeBackgroundColor}"
+                                Height="{Binding Visualizer.UiCanvasSize}"
+                                Width="{Binding Visualizer.UiCanvasSize}">
+                                <Grid
+                                    Height="{Binding Visualizer.UiCanvasSize}"
+                                    Width="{Binding Visualizer.UiCanvasSize}"
+                                    Background="{DynamicResource ThemeBackgroundColor}">
+                                    <Ellipse
+                                        HorizontalAlignment="Center"
+                                        Stroke="Black"
+                                        StrokeThickness="1"
+                                        Width="{Binding Visualizer.UiCanvasSize}"
+                                        Height="{Binding Visualizer.UiCanvasSize}"/>
+                                </Grid>
+                                <Ellipse
+                                        Fill="Red" 
+                                        Width="{Binding Visualizer.UiStickCircumference}" 
+                                        Height="{Binding Visualizer.UiStickCircumference}" 
+                                        Canvas.Bottom="{Binding Visualizer.UiStickLeftY}" 
+                                        Canvas.Left="{Binding Visualizer.UiStickLeftX}" />
+                            </Canvas>
+                        </Border>        
+                        <Border
+                            BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                            BorderThickness="1"
+                            CornerRadius="5"
+                            Height="{Binding Visualizer.UiStickBorderSize}"
+                            Width="{Binding Visualizer.UiStickBorderSize}"
+                            IsVisible="{Binding IsRight}">
+                            <Canvas
+                                Background="{DynamicResource ThemeBackgroundColor}"
+                                Height="{Binding Visualizer.UiCanvasSize}"
+                                Width="{Binding Visualizer.UiCanvasSize}">
+                                <Grid
+                                    Height="{Binding Visualizer.UiCanvasSize}"
+                                    Width="{Binding Visualizer.UiCanvasSize}"
+                                    Background="{DynamicResource ThemeBackgroundColor}">
+                                    <Ellipse
+                                        HorizontalAlignment="Center"
+                                        Stroke="Black"
+                                        StrokeThickness="1"
+                                        Width="{Binding Visualizer.UiCanvasSize}"
+                                        Height="{Binding Visualizer.UiCanvasSize}"/>
+                                </Grid>
+                                <Ellipse
+                                        Fill="Red" 
+                                        Width="{Binding Visualizer.UiStickCircumference}" 
+                                        Height="{Binding Visualizer.UiStickCircumference}" 
+                                        Canvas.Bottom="{Binding Visualizer.UiStickRightY}" 
+                                        Canvas.Left="{Binding Visualizer.UiStickRightX}" />
+                            </Canvas>
+                        </Border>        
+                    </StackPanel>
+                </Border>
                 <Border
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"

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

@@ -19,6 +19,7 @@ using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -133,20 +134,20 @@ namespace Ryujinx.Ava.UI.Views.Main
 
             if (ViewModel.SelectedApplication is null) // Checks if game data exists
             {
-                await Window.SettingsWindow.ShowDialog(Window);
+                await StyleableAppWindow.ShowAsync(Window.SettingsWindow);
             }
             else
             { 
-                bool userConfigExist = Program.FindGameConfig(Program.GetDirGameUserConfig(ViewModel.SelectedApplication.IdString, false, false));
+                bool customConfigExists = File.Exists(Program.GetDirGameUserConfig(ViewModel.SelectedApplication.IdString));
 
-                if (!ViewModel.IsGameRunning || !userConfigExist)
+                if (!ViewModel.IsGameRunning || !customConfigExists)
                 {
                     await Window.SettingsWindow.ShowDialog(Window); // The game is not running, or if the user configuration does not exist
                 }
                 else
                 {
                     // If there is a custom configuration in the folder
-                    await new GameSpecificSettingsWindow(ViewModel, userConfigExist).ShowDialog((Window)ViewModel.TopLevel);
+                    await StyleableAppWindow.ShowAsync(new GameSpecificSettingsWindow(ViewModel, customConfigExists));
                 }
             }
 
@@ -175,11 +176,13 @@ namespace Ryujinx.Ava.UI.Views.Main
 
             string name = ViewModel.AppHost.Device.Processes.ActiveApplication.ApplicationControlProperties.Title[(int)ViewModel.AppHost.Device.System.State.DesiredTitleLanguage].NameString.ToString();
 
-            await new CheatWindow(
-                Window.VirtualFileSystem,
-                ViewModel.AppHost.Device.Processes.ActiveApplication.ProgramIdText,
-                name,
-                ViewModel.SelectedApplication.Path).ShowDialog(Window);
+            await StyleableAppWindow.ShowAsync(
+                new CheatWindow(
+                    Window.VirtualFileSystem,
+                    ViewModel.AppHost.Device.Processes.ActiveApplication.ProgramIdText,
+                    name,
+                    ViewModel.SelectedApplication.Path)
+            );
 
             ViewModel.AppHost.Device.EnableCheats();
         }

src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs

@@ -47,11 +47,6 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
             Load();
-           
-#if DEBUG
-            this.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Alt));
-#endif
-           
         }
 
         public void SaveSettings()

src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs

@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Input;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
@@ -8,7 +6,6 @@ using Ryujinx.HLE.FileSystem;
 using Ryujinx.Input;
 using System;
 using System.Linq;
-using Key = Avalonia.Input.Key;
 
 namespace Ryujinx.Ava.UI.Windows
 {
@@ -27,10 +24,6 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
             Load();
-
-#if DEBUG
-            this.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Alt));
-#endif
         }
 
         public SettingsWindow()

src/Ryujinx/UI/Windows/StyleableWindow.cs

@@ -1,15 +1,26 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Media;
 using Avalonia.Platform;
 using FluentAvalonia.UI.Windowing;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
+using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Windows
 {
     public abstract class StyleableAppWindow : AppWindow
     {
+        public static async Task ShowAsync(StyleableAppWindow appWindow, Window owner = null)
+        {
+#if DEBUG
+            appWindow.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Control));   
+#endif
+            await appWindow.ShowDialog(owner ?? RyujinxApp.MainWindow);
+        }
+        
         protected StyleableAppWindow()
         {
             WindowStartupLocation = WindowStartupLocation.CenterOwner;
@@ -36,6 +47,14 @@ namespace Ryujinx.Ava.UI.Windows
 
     public abstract class StyleableWindow : Window
     {
+        public static async Task ShowAsync(StyleableWindow window, Window owner = null)
+        {
+#if DEBUG
+            window.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Control));   
+#endif
+            await window.ShowDialog(owner ?? RyujinxApp.MainWindow);
+        }
+
         protected StyleableWindow()
         {
             WindowStartupLocation = WindowStartupLocation.CenterOwner;