diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs index d6aa416f9..524148d3e 100644 --- a/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs +++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs @@ -1,3 +1,4 @@ +using Ryujinx.Ava.Utilities.Configuration.UI; using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration.Hid; using Ryujinx.Common.Configuration.Multiplayer; @@ -16,7 +17,7 @@ namespace Ryujinx.UI.Common.Configuration /// /// The current version of the file format /// - public const int CurrentVersion = 63; + public const int CurrentVersion = 64; /// /// Version of the configuration file format @@ -188,6 +189,11 @@ namespace Ryujinx.UI.Common.Configuration /// public bool CheckUpdatesOnStart { get; set; } + /// + /// How the emulator should behave when you click off/on the window. + /// + public FocusLostType FocusLostActionType { get; set; } + /// /// Show "Confirm Exit" Dialog /// diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs index 4566fd27f..fbdda7ebb 100644 --- a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs +++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs @@ -1,3 +1,4 @@ +using Ryujinx.Ava.Utilities.Configuration.UI; using Ryujinx.Common; using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration.Hid; @@ -791,6 +792,11 @@ namespace Ryujinx.UI.Common.Configuration /// public ReactiveObject CheckUpdatesOnStart { get; private set; } + /// + /// How the emulator should behave when you click off/on the window. + /// + public ReactiveObject FocusLostActionType { get; private set; } + /// /// Show "Confirm Exit" Dialog /// @@ -822,6 +828,7 @@ namespace Ryujinx.UI.Common.Configuration Debug = new DebugSection(); EnableDiscordIntegration = new ReactiveObject(); CheckUpdatesOnStart = new ReactiveObject(); + FocusLostActionType = new ReactiveObject(); ShowConfirmExit = new ReactiveObject(); RememberWindowState = new ReactiveObject(); EnableHardwareAcceleration = new ReactiveObject(); @@ -866,6 +873,7 @@ namespace Ryujinx.UI.Common.Configuration DockedMode = System.EnableDockedMode, EnableDiscordIntegration = EnableDiscordIntegration, CheckUpdatesOnStart = CheckUpdatesOnStart, + FocusLostActionType = FocusLostActionType, ShowConfirmExit = ShowConfirmExit, RememberWindowState = RememberWindowState, EnableHardwareAcceleration = EnableHardwareAcceleration, @@ -995,6 +1003,7 @@ namespace Ryujinx.UI.Common.Configuration System.SystemTimeOffset.Value = 0; System.EnableDockedMode.Value = true; EnableDiscordIntegration.Value = true; + FocusLostActionType.Value = FocusLostType.DoNothing; CheckUpdatesOnStart.Value = true; ShowConfirmExit.Value = true; RememberWindowState.Value = true; @@ -1841,6 +1850,17 @@ namespace Ryujinx.UI.Common.Configuration configurationFileUpdated = true; } + if (configurationFileFormat.Version < 64) + { + Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 64."); + + configurationFileFormat.FocusLostActionType = configurationFileFormat.DisableInputWhenOutOfFocus + ? FocusLostType.BlockInput + : FocusLostType.DoNothing; + + configurationFileUpdated = true; + } + Logger.EnableFileLog.Value = configurationFileFormat.EnableFileLog; Graphics.ResScale.Value = configurationFileFormat.ResScale; Graphics.ResScaleCustom.Value = configurationFileFormat.ResScaleCustom; @@ -1876,6 +1896,7 @@ namespace Ryujinx.UI.Common.Configuration System.EnableDockedMode.Value = configurationFileFormat.DockedMode; EnableDiscordIntegration.Value = configurationFileFormat.EnableDiscordIntegration; CheckUpdatesOnStart.Value = configurationFileFormat.CheckUpdatesOnStart; + FocusLostActionType.Value = configurationFileFormat.FocusLostActionType; ShowConfirmExit.Value = configurationFileFormat.ShowConfirmExit; RememberWindowState.Value = configurationFileFormat.RememberWindowState; EnableHardwareAcceleration.Value = configurationFileFormat.EnableHardwareAcceleration; diff --git a/src/Ryujinx.UI.Common/Configuration/UI/FocusLostType.cs b/src/Ryujinx.UI.Common/Configuration/UI/FocusLostType.cs new file mode 100644 index 000000000..104ba2e97 --- /dev/null +++ b/src/Ryujinx.UI.Common/Configuration/UI/FocusLostType.cs @@ -0,0 +1,14 @@ +using System.Text.Json.Serialization; + +namespace Ryujinx.Ava.Utilities.Configuration.UI +{ + [JsonConverter(typeof(JsonStringEnumConverter))] + public enum FocusLostType + { + DoNothing, + BlockInput, + MuteAudio, + BlockInputAndMuteAudio, + PauseEmulation + } +} diff --git a/src/Ryujinx/App.axaml.cs b/src/Ryujinx/App.axaml.cs index b1fe3ddd5..abe194e57 100644 --- a/src/Ryujinx/App.axaml.cs +++ b/src/Ryujinx/App.axaml.cs @@ -24,6 +24,8 @@ namespace Ryujinx.Ava { public class App : Application { + public static event Action ThemeChanged; + public static MainWindow MainWindow => Current! .ApplicationLifetime.Cast() .MainWindow.Cast(); @@ -122,7 +124,7 @@ namespace Ryujinx.Ava ThemeVariant systemTheme = DetectSystemTheme(); - ThemeManager.OnThemeChanged(); + ThemeChanged?.Invoke(); RequestedThemeVariant = baseStyle switch { diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs index e40f8319d..abed8eb8f 100644 --- a/src/Ryujinx/AppHost.cs +++ b/src/Ryujinx/AppHost.cs @@ -530,7 +530,7 @@ namespace Ryujinx.Ava Device?.System.ChangeDockedModeState(e.NewValue); } - private void UpdateAudioVolumeState(object sender, ReactiveEventArgs e) + public void UpdateAudioVolumeState(object sender, ReactiveEventArgs e) { Device?.SetVolume(e.NewValue); diff --git a/src/Ryujinx/Assets/Locales/ar_SA.json b/src/Ryujinx/Assets/Locales/ar_SA.json index 01a78af61..38d22511f 100644 --- a/src/Ryujinx/Assets/Locales/ar_SA.json +++ b/src/Ryujinx/Assets/Locales/ar_SA.json @@ -105,6 +105,12 @@ "SettingsTabGeneralGeneral": "عام", "SettingsTabGeneralEnableDiscordRichPresence": "تمكين وجود ديسكورد الغني", "SettingsTabGeneralCheckUpdatesOnLaunch": "التحقق من وجود تحديثات عند التشغيل", + "SettingsTabGeneralFocusLossType": "عند فقدان تركيز المحاكي:", + "SettingsTabGeneralFocusLossTypeDoNothing": "لا تفعل شيئًا", + "SettingsTabGeneralFocusLossTypeBlockInput": "حظر الإدخال", + "SettingsTabGeneralFocusLossTypeMuteAudio": "كتم الصوت", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "حظر الإدخال وكتم الصوت", + "SettingsTabGeneralFocusLossTypePauseEmulation": "إيقاف التشغيل مؤقتًا", "SettingsTabGeneralShowConfirmExitDialog": "إظهار مربع حوار \"تأكيد الخروج\"", "SettingsTabGeneralRememberWindowState": "تذكر حجم/موضع النافذة", "SettingsTabGeneralHideCursor": "إخفاء المؤشر:", diff --git a/src/Ryujinx/Assets/Locales/de_DE.json b/src/Ryujinx/Assets/Locales/de_DE.json index b52536247..65f7ee3f8 100644 --- a/src/Ryujinx/Assets/Locales/de_DE.json +++ b/src/Ryujinx/Assets/Locales/de_DE.json @@ -106,6 +106,12 @@ "SettingsTabGeneralGeneral": "Allgemein", "SettingsTabGeneralEnableDiscordRichPresence": "Aktiviere die Statusanzeige für Discord", "SettingsTabGeneralCheckUpdatesOnLaunch": "Beim Start nach Updates suchen", + "SettingsTabGeneralFocusLossType": "Beim Emulator-Fokusverlust:", + "SettingsTabGeneralFocusLossTypeDoNothing": "لNichts tun", + "SettingsTabGeneralFocusLossTypeBlockInput": "Eingabe blockieren", + "SettingsTabGeneralFocusLossTypeMuteAudio": "Lautstärke stumm", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "Eingabe blockieren & Ton stumm", + "SettingsTabGeneralFocusLossTypePauseEmulation": "إEmulation pausieren", "SettingsTabGeneralShowConfirmExitDialog": "Zeige den \"Beenden bestätigen\"-Dialog", "SettingsTabGeneralRememberWindowState": "Fenstergröße/-position merken", "SettingsTabGeneralDisableInputWhenOutOfFocus": "Eingabe deaktivieren wenn nicht fokussiert", diff --git a/src/Ryujinx/Assets/Locales/el_GR.json b/src/Ryujinx/Assets/Locales/el_GR.json index 89fc0b1cd..31499a791 100644 --- a/src/Ryujinx/Assets/Locales/el_GR.json +++ b/src/Ryujinx/Assets/Locales/el_GR.json @@ -105,6 +105,12 @@ "SettingsTabGeneralGeneral": "Γενικά", "SettingsTabGeneralEnableDiscordRichPresence": "Ενεργοποίηση Εμπλουτισμένης Παρουσίας Discord", "SettingsTabGeneralCheckUpdatesOnLaunch": "Έλεγχος για Ενημερώσεις στην Εκκίνηση", + "SettingsTabGeneralFocusLossType": "Απώλεια εστίασης του εξομοιωτή:", + "SettingsTabGeneralFocusLossTypeDoNothing": "Μη κάνεις τίποτα", + "SettingsTabGeneralFocusLossTypeBlockInput": "Αποκλεισμός εισόδου", + "SettingsTabGeneralFocusLossTypeMuteAudio": "Σίγαση έντασης", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "Αποκλεισμός εισόδου & σίγαση ήχου", + "SettingsTabGeneralFocusLossTypePauseEmulation": "Παύση προσομοίωσης", "SettingsTabGeneralShowConfirmExitDialog": "Εμφάνιση διαλόγου \"Επιβεβαίωση Εξόδου\".", "SettingsTabGeneralRememberWindowState": "Remember Window Size/Position", "SettingsTabGeneralHideCursor": "Απόκρυψη Κέρσορα:", diff --git a/src/Ryujinx/Assets/Locales/en_US.json b/src/Ryujinx/Assets/Locales/en_US.json index 570d2727e..8fe86c066 100644 --- a/src/Ryujinx/Assets/Locales/en_US.json +++ b/src/Ryujinx/Assets/Locales/en_US.json @@ -113,6 +113,12 @@ "SettingsTabGeneralGeneral": "General", "SettingsTabGeneralEnableDiscordRichPresence": "Enable Discord Rich Presence", "SettingsTabGeneralCheckUpdatesOnLaunch": "Check for Updates on Launch", + "SettingsTabGeneralFocusLossType": "On Emulator Focus Loss:", + "SettingsTabGeneralFocusLossTypeDoNothing": "Do Nothing", + "SettingsTabGeneralFocusLossTypeBlockInput": "Block Input", + "SettingsTabGeneralFocusLossTypeMuteAudio": "Mute Volume", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "Block Input & Mute Volume", + "SettingsTabGeneralFocusLossTypePauseEmulation": "Pause Emulation", "SettingsTabGeneralShowConfirmExitDialog": "Show \"Confirm Exit\" Dialog", "SettingsTabGeneralRememberWindowState": "Remember Window Size/Position", "SettingsTabGeneralDisableInputWhenOutOfFocus": "Disable Input when Out of Focus", diff --git a/src/Ryujinx/Assets/Locales/es_ES.json b/src/Ryujinx/Assets/Locales/es_ES.json index bd552e85f..3afe49de8 100644 --- a/src/Ryujinx/Assets/Locales/es_ES.json +++ b/src/Ryujinx/Assets/Locales/es_ES.json @@ -105,6 +105,12 @@ "SettingsTabGeneralGeneral": "General", "SettingsTabGeneralEnableDiscordRichPresence": "Habilitar estado en Discord", "SettingsTabGeneralCheckUpdatesOnLaunch": "Buscar actualizaciones al iniciar", + "SettingsTabGeneralFocusLossType": "Al Perder el Foco el Emulador:", + "SettingsTabGeneralFocusLossTypeDoNothing": "No Hacer Nada", + "SettingsTabGeneralFocusLossTypeBlockInput": "Bloquear Entrada", + "SettingsTabGeneralFocusLossTypeMuteAudio": "Silenciar Volumen", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "Bloquear Entrada y Silenciar el Volumen", + "SettingsTabGeneralFocusLossTypePauseEmulation": "Pausar Emulación", "SettingsTabGeneralShowConfirmExitDialog": "Mostrar diálogo de confirmación al cerrar", "SettingsTabGeneralRememberWindowState": "Remember Window Size/Position", "SettingsTabGeneralDisableInputWhenOutOfFocus": "Desactivar la Entrada al Perder el Foco", diff --git a/src/Ryujinx/Assets/Locales/fr_FR.json b/src/Ryujinx/Assets/Locales/fr_FR.json index 64e6f0cbb..3a0e4e6ee 100644 --- a/src/Ryujinx/Assets/Locales/fr_FR.json +++ b/src/Ryujinx/Assets/Locales/fr_FR.json @@ -105,6 +105,12 @@ "SettingsTabGeneralGeneral": "Général", "SettingsTabGeneralEnableDiscordRichPresence": "Activer Discord Rich Presence", "SettingsTabGeneralCheckUpdatesOnLaunch": "Vérifier les mises à jour au démarrage", + "SettingsTabGeneralFocusLossType": "Perte du Focus de l’Émulateur:", + "SettingsTabGeneralFocusLossTypeDoNothing": "Ne Rien Faire", + "SettingsTabGeneralFocusLossTypeBlockInput": "Bloquer la Saisie", + "SettingsTabGeneralFocusLossTypeMuteAudio": "Couper le Son", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "Bloquer la Saisie & Couper le Son", + "SettingsTabGeneralFocusLossTypePauseEmulation": "Pauser l'Émulation", "SettingsTabGeneralShowConfirmExitDialog": "Afficher le message de \"Confirmation de sortie\"", "SettingsTabGeneralRememberWindowState": "Mémoriser la taille/position de la fenêtre", "SettingsTabGeneralDisableInputWhenOutOfFocus": "Désactiver la Saisie en cas de Perte de Focus", diff --git a/src/Ryujinx/Assets/Locales/he_IL.json b/src/Ryujinx/Assets/Locales/he_IL.json index 33c6b3372..7dedab052 100644 --- a/src/Ryujinx/Assets/Locales/he_IL.json +++ b/src/Ryujinx/Assets/Locales/he_IL.json @@ -105,6 +105,12 @@ "SettingsTabGeneralGeneral": "כללי", "SettingsTabGeneralEnableDiscordRichPresence": "הפעלת תצוגה עשירה בדיסקורד", "SettingsTabGeneralCheckUpdatesOnLaunch": "בדוק אם קיימים עדכונים בהפעלה", + "SettingsTabGeneralFocusLossType": "כאשר האמולטור מאבד את הפוקוס:", + "SettingsTabGeneralFocusLossTypeDoNothing": "לא לעשות כלום", + "SettingsTabGeneralFocusLossTypeBlockInput": "חסום קלט", + "SettingsTabGeneralFocusLossTypeMuteAudio": "כבה את הווליום", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "חסום קלט וכבה קול", + "SettingsTabGeneralFocusLossTypePauseEmulation": "השהיית האמולציה", "SettingsTabGeneralShowConfirmExitDialog": "הראה דיאלוג \"אשר יציאה\"", "SettingsTabGeneralRememberWindowState": "Remember Window Size/Position", "SettingsTabGeneralHideCursor": "הסתר את הסמן", diff --git a/src/Ryujinx/Assets/Locales/it_IT.json b/src/Ryujinx/Assets/Locales/it_IT.json index a49aa15ff..1b7577144 100644 --- a/src/Ryujinx/Assets/Locales/it_IT.json +++ b/src/Ryujinx/Assets/Locales/it_IT.json @@ -112,6 +112,12 @@ "SettingsTabGeneralGeneral": "Generali", "SettingsTabGeneralEnableDiscordRichPresence": "Attiva Discord Rich Presence", "SettingsTabGeneralCheckUpdatesOnLaunch": "Controlla aggiornamenti all'avvio", + "SettingsTabGeneralFocusLossType": "Quando l’emulatore perde focus:", + "SettingsTabGeneralFocusLossTypeDoNothing": "Non fare nulla", + "SettingsTabGeneralFocusLossTypeBlockInput": "Blocca input", + "SettingsTabGeneralFocusLossTypeMuteAudio": "Disattiva volume", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "Blocca input & silenzia volume", + "SettingsTabGeneralFocusLossTypePauseEmulation": "Pausa emulazione", "SettingsTabGeneralShowConfirmExitDialog": "Mostra dialogo \"Conferma Uscita\"", "SettingsTabGeneralRememberWindowState": "Ricorda la dimensione e la posizione della finestra", "SettingsTabGeneralDisableInputWhenOutOfFocus": "Disabilità Input quando fuori dal focus", diff --git a/src/Ryujinx/Assets/Locales/ja_JP.json b/src/Ryujinx/Assets/Locales/ja_JP.json index 4a9fc950e..46aa007b6 100644 --- a/src/Ryujinx/Assets/Locales/ja_JP.json +++ b/src/Ryujinx/Assets/Locales/ja_JP.json @@ -105,6 +105,12 @@ "SettingsTabGeneralGeneral": "一般", "SettingsTabGeneralEnableDiscordRichPresence": "Discord リッチプレゼンスを有効にする", "SettingsTabGeneralCheckUpdatesOnLaunch": "起動時にアップデートを確認する", + "SettingsTabGeneralFocusLossType": "エミュレーターのフォーカス喪失時:", + "SettingsTabGeneralFocusLossTypeDoNothing": "何もしない", + "SettingsTabGeneralFocusLossTypeBlockInput": "入力をブロック", + "SettingsTabGeneralFocusLossTypeMuteAudio": "音量をミュート", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "入力をブロック&音量を消音", + "SettingsTabGeneralFocusLossTypePauseEmulation": "エミュレーション一時停止", "SettingsTabGeneralShowConfirmExitDialog": "\"終了を確認\" ダイアログを表示する", "SettingsTabGeneralRememberWindowState": "Remember Window Size/Position", "SettingsTabGeneralHideCursor": "マウスカーソルを非表示", diff --git a/src/Ryujinx/Assets/Locales/ko_KR.json b/src/Ryujinx/Assets/Locales/ko_KR.json index 85d338180..3bb338c8b 100644 --- a/src/Ryujinx/Assets/Locales/ko_KR.json +++ b/src/Ryujinx/Assets/Locales/ko_KR.json @@ -107,6 +107,12 @@ "SettingsTabGeneralGeneral": "일반", "SettingsTabGeneralEnableDiscordRichPresence": "디스코드 활동 상태 활성화", "SettingsTabGeneralCheckUpdatesOnLaunch": "시작 시, 업데이트 확인", + "SettingsTabGeneralFocusLossType": "에뮬레이터 포커스 상실 시:", + "SettingsTabGeneralFocusLossTypeDoNothing": "아무것도 하지 않음", + "SettingsTabGeneralFocusLossTypeBlockInput": "입력 차단", + "SettingsTabGeneralFocusLossTypeMuteAudio": "음소거", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "입력 차단 & 음소거", + "SettingsTabGeneralFocusLossTypePauseEmulation": "에뮬레이션 일시중지", "SettingsTabGeneralShowConfirmExitDialog": "\"종료 확인\" 대화 상자 표시", "SettingsTabGeneralRememberWindowState": "창 크기/위치 기억", "SettingsTabGeneralDisableInputWhenOutOfFocus": "초점이 맞지 않으면 입력 비활성화", diff --git a/src/Ryujinx/Assets/Locales/pl_PL.json b/src/Ryujinx/Assets/Locales/pl_PL.json index 78a4e5f24..18a009719 100644 --- a/src/Ryujinx/Assets/Locales/pl_PL.json +++ b/src/Ryujinx/Assets/Locales/pl_PL.json @@ -105,6 +105,12 @@ "SettingsTabGeneralGeneral": "Ogólne", "SettingsTabGeneralEnableDiscordRichPresence": "Włącz Bogatą Obecność Discord", "SettingsTabGeneralCheckUpdatesOnLaunch": "Sprawdzaj aktualizacje przy uruchomieniu", + "SettingsTabGeneralFocusLossType": "Gdy emulator traci fokus:", + "SettingsTabGeneralFocusLossTypeDoNothing": "Nie rób nic", + "SettingsTabGeneralFocusLossTypeBlockInput": "Zablokuj wejście", + "SettingsTabGeneralFocusLossTypeMuteAudio": "Wycisz głośność", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "Blokuj wejście & wycisz dźwięk", + "SettingsTabGeneralFocusLossTypePauseEmulation": "Wstrzymaj emulację", "SettingsTabGeneralShowConfirmExitDialog": "Pokazuj okno dialogowe \"Potwierdź wyjście\"", "SettingsTabGeneralRememberWindowState": "Remember Window Size/Position", "SettingsTabGeneralHideCursor": "Ukryj kursor:", diff --git a/src/Ryujinx/Assets/Locales/pt_BR.json b/src/Ryujinx/Assets/Locales/pt_BR.json index 7fe7af5b5..4ebbee0a7 100644 --- a/src/Ryujinx/Assets/Locales/pt_BR.json +++ b/src/Ryujinx/Assets/Locales/pt_BR.json @@ -107,6 +107,12 @@ "SettingsTabGeneralGeneral": "Geral", "SettingsTabGeneralEnableDiscordRichPresence": "Habilitar Rich Presence do Discord", "SettingsTabGeneralCheckUpdatesOnLaunch": "Verificar se há atualizações ao iniciar", + "SettingsTabGeneralFocusLossType": "Ao Perder o Foco do Emulador:", + "SettingsTabGeneralFocusLossTypeDoNothing": "Não Fazer Nada", + "SettingsTabGeneralFocusLossTypeBlockInput": "Bloquear controles", + "SettingsTabGeneralFocusLossTypeMuteAudio": "Ficar mudo", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "Bloquear controles & silenciar", + "SettingsTabGeneralFocusLossTypePauseEmulation": "Pausar emulação", "SettingsTabGeneralShowConfirmExitDialog": "Exibir diálogo de confirmação ao sair", "SettingsTabGeneralRememberWindowState": "Lembrar tamanho/posição da Janela", "SettingsTabGeneralDisableInputWhenOutOfFocus": "Desativar Controles Quando Estiver Fora de Foco", diff --git a/src/Ryujinx/Assets/Locales/ru_RU.json b/src/Ryujinx/Assets/Locales/ru_RU.json index 506d13a4e..6cb890cd2 100644 --- a/src/Ryujinx/Assets/Locales/ru_RU.json +++ b/src/Ryujinx/Assets/Locales/ru_RU.json @@ -112,6 +112,12 @@ "SettingsTabGeneralGeneral": "Общее", "SettingsTabGeneralEnableDiscordRichPresence": "Статус активности в Discord", "SettingsTabGeneralCheckUpdatesOnLaunch": "Проверять наличие обновлений при запуске", + "SettingsTabGeneralFocusLossType": "При потере фокуса эмулятором:", + "SettingsTabGeneralFocusLossTypeDoNothing": "Ничего не делать", + "SettingsTabGeneralFocusLossTypeBlockInput": "Блокировать ввод", + "SettingsTabGeneralFocusLossTypeMuteAudio": "Отключить звук", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "Блокировать ввод & отключить звук", + "SettingsTabGeneralFocusLossTypePauseEmulation": "Пауза эмуляции", "SettingsTabGeneralShowConfirmExitDialog": "Подтверждать выход из приложения", "SettingsTabGeneralRememberWindowState": "Запомнить размер/положение окна", "SettingsTabGeneralDisableInputWhenOutOfFocus": "Отключить ввод при потере фокуса", diff --git a/src/Ryujinx/Assets/Locales/th_TH.json b/src/Ryujinx/Assets/Locales/th_TH.json index ada700bba..63b29e7b9 100644 --- a/src/Ryujinx/Assets/Locales/th_TH.json +++ b/src/Ryujinx/Assets/Locales/th_TH.json @@ -105,6 +105,12 @@ "SettingsTabGeneralGeneral": "ทั่วไป", "SettingsTabGeneralEnableDiscordRichPresence": "เปิดใช้งาน Discord Rich Presence", "SettingsTabGeneralCheckUpdatesOnLaunch": "ตรวจหาการอัปเดตเมื่อเปิดโปรแกรม", + "SettingsTabGeneralFocusLossType": "เมื่อโปรแกรมจำลองสูญเสียโฟกัส:", + "SettingsTabGeneralFocusLossTypeDoNothing": "ไม่ทำอะไร", + "SettingsTabGeneralFocusLossTypeBlockInput": "บล็อกการป้อนข้อมูล", + "SettingsTabGeneralFocusLossTypeMuteAudio": "ปิดเสียง", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "บล็อกข้อมูล & ปิดเสียง", + "SettingsTabGeneralFocusLossTypePauseEmulation": "พักการจำลอง", "SettingsTabGeneralShowConfirmExitDialog": "แสดง \"ยืนยันการออก\" กล่องข้อความโต้ตอบ", "SettingsTabGeneralRememberWindowState": "Remember Window Size/Position", "SettingsTabGeneralDisableInputWhenOutOfFocus": "ปิดการพิมพ์เมื่อไม่ได้เลือกช่องอินพุต ไม่ให้กรอกข้อมูลเมื่อช่องอินพุตไม่อยู่ในโฟกัส", diff --git a/src/Ryujinx/Assets/Locales/tr_TR.json b/src/Ryujinx/Assets/Locales/tr_TR.json index b7bedeadf..8a4b8f2e7 100644 --- a/src/Ryujinx/Assets/Locales/tr_TR.json +++ b/src/Ryujinx/Assets/Locales/tr_TR.json @@ -105,6 +105,12 @@ "SettingsTabGeneralGeneral": "Genel", "SettingsTabGeneralEnableDiscordRichPresence": "Discord Zengin İçerik'i Etkinleştir", "SettingsTabGeneralCheckUpdatesOnLaunch": "Her Açılışta Güncellemeleri Denetle", + "SettingsTabGeneralFocusLossType": "Emülatör odak kaybı:", + "SettingsTabGeneralFocusLossTypeDoNothing": "Hiçbir şey yapma", + "SettingsTabGeneralFocusLossTypeBlockInput": "Girişi Engelle", + "SettingsTabGeneralFocusLossTypeMuteAudio": "Sesi Kapat", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "Girişi engelle & sesi kapat", + "SettingsTabGeneralFocusLossTypePauseEmulation": "Emülasyonu Duraklat", "SettingsTabGeneralShowConfirmExitDialog": "\"Çıkışı Onayla\" Diyaloğunu Göster", "SettingsTabGeneralRememberWindowState": "Remember Window Size/Position", "SettingsTabGeneralHideCursor": "İşaretçiyi Gizle:", diff --git a/src/Ryujinx/Assets/Locales/uk_UA.json b/src/Ryujinx/Assets/Locales/uk_UA.json index 42d103d26..56d9b19c6 100644 --- a/src/Ryujinx/Assets/Locales/uk_UA.json +++ b/src/Ryujinx/Assets/Locales/uk_UA.json @@ -107,6 +107,12 @@ "SettingsTabGeneralGeneral": "Загальні", "SettingsTabGeneralEnableDiscordRichPresence": "Увімкнути розширену присутність Discord", "SettingsTabGeneralCheckUpdatesOnLaunch": "Перевіряти наявність оновлень під час запуску", + "SettingsTabGeneralFocusLossType": "При втраті фокуса емулятором:", + "SettingsTabGeneralFocusLossTypeDoNothing": "Нічого не робити", + "SettingsTabGeneralFocusLossTypeBlockInput": "Заблокувати введення", + "SettingsTabGeneralFocusLossTypeMuteAudio": "Вимкнути звук", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "Блокувати введення & вимкнути звук", + "SettingsTabGeneralFocusLossTypePauseEmulation": "Пауза емуляції", "SettingsTabGeneralShowConfirmExitDialog": "Показати діалогове вікно «Підтвердити вихід».", "SettingsTabGeneralRememberWindowState": "Remember Window Size/Position", "SettingsTabGeneralDisableInputWhenOutOfFocus": "Вимкнути введення, якщо вікно неактивне", diff --git a/src/Ryujinx/Assets/Locales/zh_CN.json b/src/Ryujinx/Assets/Locales/zh_CN.json index 9671a68a5..781c8dc3c 100644 --- a/src/Ryujinx/Assets/Locales/zh_CN.json +++ b/src/Ryujinx/Assets/Locales/zh_CN.json @@ -107,6 +107,12 @@ "SettingsTabGeneralGeneral": "常规", "SettingsTabGeneralEnableDiscordRichPresence": "启用 Discord 在线状态展示", "SettingsTabGeneralCheckUpdatesOnLaunch": "启动时检查更新", + "SettingsTabGeneralFocusLossType": "当模拟器失去焦点时:", + "SettingsTabGeneralFocusLossTypeDoNothing": "什么也不做", + "SettingsTabGeneralFocusLossTypeBlockInput": "阻止输入", + "SettingsTabGeneralFocusLossTypeMuteAudio": "静音", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "阻止输入并静音", + "SettingsTabGeneralFocusLossTypePauseEmulation": "暂停模拟", "SettingsTabGeneralShowConfirmExitDialog": "退出游戏时需要确认", "SettingsTabGeneralRememberWindowState": "记住窗口大小和位置", "SettingsTabGeneralDisableInputWhenOutOfFocus": "在后台时禁用输入", diff --git a/src/Ryujinx/Assets/Locales/zh_TW.json b/src/Ryujinx/Assets/Locales/zh_TW.json index 5e29e8783..0a32cb52c 100644 --- a/src/Ryujinx/Assets/Locales/zh_TW.json +++ b/src/Ryujinx/Assets/Locales/zh_TW.json @@ -107,6 +107,12 @@ "SettingsTabGeneralGeneral": "一般", "SettingsTabGeneralEnableDiscordRichPresence": "啟用 Discord 動態狀態展示", "SettingsTabGeneralCheckUpdatesOnLaunch": "啟動時檢查更新", + "SettingsTabGeneralFocusLossType": "當模擬器失去焦點時:", + "SettingsTabGeneralFocusLossTypeDoNothing": "什麼都不做", + "SettingsTabGeneralFocusLossTypeBlockInput": "阻止輸入", + "SettingsTabGeneralFocusLossTypeMuteAudio": "靜音", + "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio": "停用輸入 & 靜音", + "SettingsTabGeneralFocusLossTypePauseEmulation": "暫停模擬", "SettingsTabGeneralShowConfirmExitDialog": "顯示「確認結束」對話方塊", "SettingsTabGeneralRememberWindowState": "記住視窗大小/位置", "SettingsTabGeneralDisableInputWhenOutOfFocus": "在「失去焦點」時停用輸入", diff --git a/src/Ryujinx/Common/ThemeManager.cs b/src/Ryujinx/Common/ThemeManager.cs deleted file mode 100644 index 8c52c2a66..000000000 --- a/src/Ryujinx/Common/ThemeManager.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; - -namespace Ryujinx.Ava.Common -{ - public static class ThemeManager - { - public static event EventHandler ThemeChanged; - - public static void OnThemeChanged() - { - ThemeChanged?.Invoke(null, EventArgs.Empty); - } - } -} diff --git a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs index dda3dfc0a..76d97d78f 100644 --- a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs @@ -29,10 +29,10 @@ namespace Ryujinx.Ava.UI.ViewModels Version = Program.Version; UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value); - ThemeManager.ThemeChanged += ThemeManager_ThemeChanged; + App.ThemeChanged += Ryujinx_ThemeChanged; } - private void ThemeManager_ThemeChanged(object sender, EventArgs e) + private void Ryujinx_ThemeChanged() { Dispatcher.UIThread.Post(() => UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value)); } @@ -55,7 +55,7 @@ namespace Ryujinx.Ava.UI.ViewModels public void Dispose() { - ThemeManager.ThemeChanged -= ThemeManager_ThemeChanged; + App.ThemeChanged -= Ryujinx_ThemeChanged; GC.SuppressFinalize(this); } } diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs index 7e3b34443..c855f207d 100644 --- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs @@ -11,6 +11,7 @@ using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.UI.Helpers; using Ryujinx.Ava.UI.Models.Input; using Ryujinx.Ava.UI.Windows; +using Ryujinx.Ava.Utilities.Configuration.UI; using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration.Multiplayer; using Ryujinx.Common.GraphicsDriver; @@ -154,6 +155,8 @@ namespace Ryujinx.Ava.UI.ViewModels public bool EnableMouse { get; set; } public bool DisableInputWhenOutOfFocus { get; set; } + public int FocusLostActionType { get; set; } + public VSyncMode VSyncMode { get => _vSyncMode; @@ -575,6 +578,7 @@ namespace Ryujinx.Ava.UI.ViewModels ShowConfirmExit = config.ShowConfirmExit; RememberWindowState = config.RememberWindowState; HideCursor = (int)config.HideCursor.Value; + FocusLostActionType = (int)config.FocusLostActionType.Value; GameDirectories.Clear(); GameDirectories.AddRange(config.UI.GameDirs.Value); @@ -693,6 +697,7 @@ namespace Ryujinx.Ava.UI.ViewModels config.ShowConfirmExit.Value = ShowConfirmExit; config.RememberWindowState.Value = RememberWindowState; config.HideCursor.Value = (HideCursorMode)HideCursor; + config.FocusLostActionType.Value = (FocusLostType)FocusLostActionType; if (_gameDirectoryChanged) { diff --git a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml index cd3bf41e4..7e089eaf5 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml @@ -39,9 +39,30 @@ - - - + + + + + + + + + + + + + + + + + + + +