Compare commits
6 Commits
Canary-1.2
...
3e5f5ee78c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3e5f5ee78c | ||
|
|
21c37ca8a5 | ||
|
|
d7f095723c | ||
|
|
05c7839b2d | ||
|
|
bbd099b129 | ||
|
|
54bdfc71a9 |
4
.github/workflows/canary.yml
vendored
4
.github/workflows/canary.yml
vendored
@@ -29,7 +29,7 @@ env:
|
||||
jobs:
|
||||
tag:
|
||||
name: Create tag
|
||||
runs-on: ubuntu-24.04
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Get version info
|
||||
id: version_info
|
||||
@@ -202,7 +202,7 @@ jobs:
|
||||
|
||||
macos_release:
|
||||
name: Release MacOS universal
|
||||
runs-on: ubuntu-24.04
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
|
||||
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
@@ -18,7 +18,7 @@ env:
|
||||
jobs:
|
||||
tag:
|
||||
name: Create tag
|
||||
runs-on: ubuntu-24.04
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Get version info
|
||||
id: version_info
|
||||
@@ -183,7 +183,7 @@ jobs:
|
||||
|
||||
macos_release:
|
||||
name: Release MacOS universal
|
||||
runs-on: ubuntu-24.04
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
|
||||
@@ -39,12 +39,12 @@
|
||||
<p align="center">
|
||||
Click below to join the Discord:
|
||||
<br>
|
||||
<a href="https://discord.gg/PEuzjrFXUA">
|
||||
<a href="https://discord.gg/dHPrkBkkyA">
|
||||
<img src="https://img.shields.io/discord/1294443224030511104?color=5865F2&label=Ryubing&logo=discord&logoColor=white" alt="Discord">
|
||||
</a>
|
||||
<br>
|
||||
<br>
|
||||
<img src="https://raw.githubusercontent.com/Ryubing/Ryujinx/refs/heads/master/docs/shell.png">
|
||||
<img src="https://raw.githubusercontent.com/GreemDev/Ryujinx/refs/heads/master/docs/shell.png">
|
||||
</p>
|
||||
|
||||
## Usage
|
||||
|
||||
@@ -1249,7 +1249,7 @@
|
||||
0100A6B00D4EC000,"Furwind",,playable,2021-02-19 19:44:08
|
||||
0100ECE00C0C4000,"Fury Unleashed",crash;services,ingame,2020-10-18 11:52:40
|
||||
010070000ED9E000,"Fury Unleashed Demo",,playable,2020-10-08 20:09:21
|
||||
0100E1F013674000,"FUSER™",nvdec;UE4;slow;gpu,ingame,2025-02-12 16:03:00
|
||||
0100E1F013674000,"FUSER™",nvdec;UE4,playable,2022-10-17 20:58:32
|
||||
0100A7A015E4C000,"Fushigi no Gensokyo Lotus Labyrinth",Needs Update;audio;gpu;nvdec,ingame,2021-01-20 15:30:02
|
||||
01003C300B274000,"Futari de! Nyanko Daisensou",,playable,2024-01-05 22:26:52
|
||||
010055801134E000,"FUZE Player",online-broken;vulkan-backend-bug,ingame,2022-10-18 12:23:53
|
||||
|
||||
|
@@ -517,7 +517,7 @@ namespace Ryujinx.Ava
|
||||
Device?.System.ChangeDockedModeState(e.NewValue);
|
||||
}
|
||||
|
||||
public void UpdateAudioVolumeState(object sender, ReactiveEventArgs<float> e)
|
||||
private void UpdateAudioVolumeState(object sender, ReactiveEventArgs<float> e)
|
||||
{
|
||||
Device?.SetVolume(e.NewValue);
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
"ID": "MenuBarFileOpenAppletOpenMiiApplet",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Mii-Bearbeitungsapplet",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Mii Edit Applet",
|
||||
"es_ES": "Applet Editor Mii",
|
||||
@@ -176,7 +176,7 @@
|
||||
"ID": "SettingsTabSystemMemoryManagerModeSoftware",
|
||||
"Translations": {
|
||||
"ar_SA": "البرنامج",
|
||||
"de_DE": "Programme",
|
||||
"de_DE": "",
|
||||
"el_GR": "Λογισμικό",
|
||||
"en_US": "Software",
|
||||
"es_ES": "",
|
||||
@@ -326,7 +326,7 @@
|
||||
"ID": "MenuBarFileOpenFromFileError",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Keine Anwendungen im ausgewählten Datei gefunden.",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "No applications found in selected file.",
|
||||
"es_ES": "No se encontraron aplicaciones en el archivo seleccionado.",
|
||||
@@ -376,7 +376,7 @@
|
||||
"ID": "MenuBarFileLoadDlcFromFolder",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "DLC aus Ordner laden",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Load DLC From Folder",
|
||||
"es_ES": "Cargar DLC Desde Carpeta",
|
||||
@@ -401,7 +401,7 @@
|
||||
"ID": "MenuBarFileLoadTitleUpdatesFromFolder",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Titel-Updates aus Ordner laden",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Load Title Updates From Folder",
|
||||
"es_ES": "Cargar Actualizaciones de Títulos Desde Carpeta",
|
||||
@@ -576,7 +576,7 @@
|
||||
"ID": "MenuBarOptionsStartGamesWithoutUI",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Spiele ohne Benutzeroberfläche starten",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Start Games with UI Hidden",
|
||||
"es_ES": "",
|
||||
@@ -589,7 +589,7 @@
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Iniciar jogos ocultando a interface",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "Starta spel med dolt användargränssnitt",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
@@ -751,7 +751,7 @@
|
||||
"ID": "MenuBarActionsScanAmiiboBin",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Amiibo scannen (aus Bin-Datei)",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Scan An Amiibo (From Bin)",
|
||||
"es_ES": "",
|
||||
@@ -851,7 +851,7 @@
|
||||
"ID": "MenuBarActionsInstallKeys",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Schlüssel installieren",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Install Keys",
|
||||
"es_ES": "",
|
||||
@@ -876,7 +876,7 @@
|
||||
"ID": "MenuBarFileActionsInstallKeysFromFile",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Schlüssel aus KEYS oder ZIP installieren",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Install keys from KEYS or ZIP",
|
||||
"es_ES": "Instalar keys de KEYS o ZIP",
|
||||
@@ -901,7 +901,7 @@
|
||||
"ID": "MenuBarFileActionsInstallKeysFromFolder",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Schlüssel aus einem Verzeichnis installieren",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Install keys from a directory",
|
||||
"es_ES": "Instalar keys de un directorio",
|
||||
@@ -1001,7 +1001,7 @@
|
||||
"ID": "MenuBarActionsXCITrimmer",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "XCI-Dateien trimmen",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Trim XCI Files",
|
||||
"es_ES": "Recortar archivos XCI",
|
||||
@@ -1226,7 +1226,7 @@
|
||||
"ID": "MenuBarHelpFaqAndGuides",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "FAQ & Anleitungen",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "FAQ & Guides",
|
||||
"es_ES": "",
|
||||
@@ -1251,7 +1251,7 @@
|
||||
"ID": "MenuBarHelpFaq",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "FAQ & Fehlerbehebung Seite",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "FAQ & Troubleshooting Page",
|
||||
"es_ES": "",
|
||||
@@ -1276,7 +1276,7 @@
|
||||
"ID": "MenuBarHelpFaqTooltip",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Öffnet die FAQ- und Fehlerbehebungsseite im offiziellen Ryujinx-Wiki",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Opens the FAQ and Troubleshooting page on the official Ryujinx wiki",
|
||||
"es_ES": "",
|
||||
@@ -1301,7 +1301,7 @@
|
||||
"ID": "MenuBarHelpSetup",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Setup- und Konfigurationsanleitung",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Setup & Configuration Guide",
|
||||
"es_ES": "",
|
||||
@@ -1326,7 +1326,7 @@
|
||||
"ID": "MenuBarHelpSetupTooltip",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Öffnet die Setup- und Konfigurationsanleitung im offiziellen Ryujinx-Wiki",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Opens the Setup & Configuration guide on the official Ryujinx wiki",
|
||||
"es_ES": "",
|
||||
@@ -1351,7 +1351,7 @@
|
||||
"ID": "MenuBarHelpMultiplayer",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Multiplayer (LDN/LAN) Anleitung",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Multiplayer (LDN/LAN) Guide",
|
||||
"es_ES": "",
|
||||
@@ -1376,7 +1376,7 @@
|
||||
"ID": "MenuBarHelpMultiplayerTooltip",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Öffnet die Multiplayer-Anleitung im offiziellen Ryujinx-Wiki",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Opens the Multiplayer guide on the official Ryujinx wiki",
|
||||
"es_ES": "",
|
||||
@@ -1526,7 +1526,7 @@
|
||||
"ID": "GameListHeaderDeveloper",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Entwickelt von {0}",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Developed by {0}",
|
||||
"es_ES": "",
|
||||
@@ -1826,7 +1826,7 @@
|
||||
"ID": "GameListHeaderCompatibilityStatus",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Kompatibilität:",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Compatibility:",
|
||||
"es_ES": "",
|
||||
@@ -2614,7 +2614,7 @@
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Extraia o RomFS de um arquivo DLC selecionado",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "Extrahera RomFS från en vald DLC-fil",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
@@ -3062,7 +3062,7 @@
|
||||
"ko_KR": "XCI 파일 '{0}' 트리밍",
|
||||
"no_NO": "Trimming av XCI-filen '{0}'",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Reduzindo arquivo XCI '{0}'",
|
||||
"pt_BR": "Reduzindo arquivo XCI '{0}",
|
||||
"ru_RU": "Обрезается XCI файл '{0}'",
|
||||
"sv_SE": "Optimerar XCI-filen '{0}'",
|
||||
"th_TH": "",
|
||||
@@ -3362,13 +3362,13 @@
|
||||
"ko_KR": "",
|
||||
"no_NO": "",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Verificar atualizações:",
|
||||
"pt_BR": "",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "检查更新",
|
||||
"zh_CN": "",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -3387,13 +3387,13 @@
|
||||
"ko_KR": "",
|
||||
"no_NO": "",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Desligado",
|
||||
"pt_BR": "",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "关闭",
|
||||
"zh_CN": "",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -3418,7 +3418,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "提示",
|
||||
"zh_CN": "",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -3437,163 +3437,13 @@
|
||||
"ko_KR": "",
|
||||
"no_NO": "",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Fundo",
|
||||
"pt_BR": "",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "背景",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"ID": "SettingsTabGeneralFocusLossType",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "On Emulator Focus Lost:",
|
||||
"es_ES": "",
|
||||
"fr_FR": "",
|
||||
"he_IL": "",
|
||||
"it_IT": "",
|
||||
"ja_JP": "",
|
||||
"ko_KR": "",
|
||||
"no_NO": "",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Ao perder o Foco do emulador:",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "当模拟器在后台时:",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"ID": "SettingsTabGeneralFocusLossTypeDoNothing",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Do Nothing",
|
||||
"es_ES": "",
|
||||
"fr_FR": "",
|
||||
"he_IL": "",
|
||||
"it_IT": "",
|
||||
"ja_JP": "",
|
||||
"ko_KR": "",
|
||||
"no_NO": "",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Não fazer nada",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "什么事情也不做",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"ID": "SettingsTabGeneralFocusLossTypeBlockInput",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Block Input",
|
||||
"es_ES": "",
|
||||
"fr_FR": "",
|
||||
"he_IL": "",
|
||||
"it_IT": "",
|
||||
"ja_JP": "",
|
||||
"ko_KR": "",
|
||||
"no_NO": "",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Bloquear entrada",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "禁用输入",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"ID": "SettingsTabGeneralFocusLossTypeMuteAudio",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Mute Volume",
|
||||
"es_ES": "",
|
||||
"fr_FR": "",
|
||||
"he_IL": "",
|
||||
"it_IT": "",
|
||||
"ja_JP": "",
|
||||
"ko_KR": "",
|
||||
"no_NO": "",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Ficar mudo",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "静音",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"ID": "SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Block Input & Mute Volume",
|
||||
"es_ES": "",
|
||||
"fr_FR": "",
|
||||
"he_IL": "",
|
||||
"it_IT": "",
|
||||
"ja_JP": "",
|
||||
"ko_KR": "",
|
||||
"no_NO": "",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Bloquear entrada & Ficar mudo",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "阻止输入且静音",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"ID": "SettingsTabGeneralFocusLossTypePauseEmulation",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Pause Emulation",
|
||||
"es_ES": "",
|
||||
"fr_FR": "",
|
||||
"he_IL": "",
|
||||
"it_IT": "",
|
||||
"ja_JP": "",
|
||||
"ko_KR": "",
|
||||
"no_NO": "",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Pausar a emulação",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "暂停模拟",
|
||||
"zh_CN": "",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -3662,13 +3512,13 @@
|
||||
"ko_KR": "",
|
||||
"no_NO": "Deaktiver inndata når vinduet er ute av fokus",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Desativar entrada quando estiver fora de foco",
|
||||
"pt_BR": "",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "在后台时禁用输入",
|
||||
"zh_CN": "",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -4621,7 +4471,7 @@
|
||||
"zh_CN": "繁体中文(推荐)",
|
||||
"zh_TW": "正體中文 (建議)"
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
"ID": "SettingsTabSystemSystemLanguageSwedish",
|
||||
"Translations": {
|
||||
@@ -4643,10 +4493,10 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "瑞典语",
|
||||
"zh_CN": "",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
"ID": "SettingsTabSystemSystemLanguageNorwegian",
|
||||
"Translations": {
|
||||
@@ -4668,7 +4518,7 @@
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "挪威语",
|
||||
"zh_CN": "",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -6012,13 +5862,13 @@
|
||||
"ko_KR": "",
|
||||
"no_NO": "",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Habilitar logs da IU",
|
||||
"pt_BR": "",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "启用 UI 日志",
|
||||
"zh_CN": "",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -6464,7 +6314,7 @@
|
||||
"pl_PL": "",
|
||||
"pt_BR": "",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "Ok",
|
||||
"sv_SE": "",
|
||||
"th_TH": "ตกลง",
|
||||
"tr_TR": "Tamam",
|
||||
"uk_UA": "",
|
||||
@@ -8364,7 +8214,7 @@
|
||||
"pl_PL": "",
|
||||
"pt_BR": "",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "Inaktivera",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
@@ -8389,7 +8239,7 @@
|
||||
"pl_PL": "",
|
||||
"pt_BR": "",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "Regnbåge",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
@@ -8439,7 +8289,7 @@
|
||||
"pl_PL": "",
|
||||
"pt_BR": "",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "Färg",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
@@ -15239,7 +15089,7 @@
|
||||
"pl_PL": "Seria Amiibo",
|
||||
"pt_BR": "Franquia Amiibo",
|
||||
"ru_RU": "Серия Amiibo",
|
||||
"sv_SE": "Amiibo-serie",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "Amiibo Serisi",
|
||||
"uk_UA": "Серія Amiibo",
|
||||
@@ -17012,13 +16862,13 @@
|
||||
"ko_KR": "",
|
||||
"no_NO": "",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Imprimir mensagens de log do Avalonia (IU) no console.",
|
||||
"pt_BR": "",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "在控制台显示 Avalonia (UI) 的日志信息",
|
||||
"zh_CN": "",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -17937,13 +17787,13 @@
|
||||
"ko_KR": "",
|
||||
"no_NO": "",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Atualização disponível!",
|
||||
"pt_BR": "",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
"zh_CN": "有可用的更新!",
|
||||
"zh_CN": "",
|
||||
"zh_TW": ""
|
||||
}
|
||||
},
|
||||
@@ -18587,7 +18437,7 @@
|
||||
"ko_KR": "(실패)",
|
||||
"no_NO": "(Mislyktes)",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Falhou",
|
||||
"pt_BR": "Falhado",
|
||||
"ru_RU": "(Ошибка)",
|
||||
"sv_SE": "(misslyckades)",
|
||||
"th_TH": "",
|
||||
@@ -18664,7 +18514,7 @@
|
||||
"pl_PL": "",
|
||||
"pt_BR": "{0} - Informação",
|
||||
"ru_RU": "{0} - Информация",
|
||||
"sv_SE": "{0} - Information",
|
||||
"sv_SE": "",
|
||||
"th_TH": "{0} – ข้อมูล",
|
||||
"tr_TR": "{0} - Bilgi",
|
||||
"uk_UA": "{0} - Інформація",
|
||||
@@ -19739,7 +19589,7 @@
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Configurações de LED",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "LED-inställningar",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
@@ -20587,7 +20437,7 @@
|
||||
"ko_KR": "실패",
|
||||
"no_NO": "Mislyktes",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Falhou",
|
||||
"pt_BR": "Falhado",
|
||||
"ru_RU": "Ошибка",
|
||||
"sv_SE": "Misslyckades",
|
||||
"th_TH": "",
|
||||
@@ -20687,7 +20537,7 @@
|
||||
"ko_KR": "표시됨 선택",
|
||||
"no_NO": "Velg vist",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Selecionar mostrado(s)",
|
||||
"pt_BR": "Seleccionar mostrado(s)",
|
||||
"ru_RU": "Выбрать то что показано",
|
||||
"sv_SE": "Markera visade",
|
||||
"th_TH": "",
|
||||
@@ -20712,7 +20562,7 @@
|
||||
"ko_KR": "표시됨 선택 취소",
|
||||
"no_NO": "Opphev valg av Vist",
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Desmarcar mostrado(s)",
|
||||
"pt_BR": "Deseleccionar mostrado(s)",
|
||||
"ru_RU": "Отменить выбор показанного",
|
||||
"sv_SE": "Avmarkera visade",
|
||||
"th_TH": "",
|
||||
@@ -21939,7 +21789,7 @@
|
||||
"pl_PL": "Głoś",
|
||||
"pt_BR": "",
|
||||
"ru_RU": "Громкость",
|
||||
"sv_SE": "Volym",
|
||||
"sv_SE": "",
|
||||
"th_TH": "ระดับเสียง",
|
||||
"tr_TR": "Ses",
|
||||
"uk_UA": "Гуч.",
|
||||
@@ -23351,7 +23201,7 @@
|
||||
"ID": "SettingsTabSystemVSyncModeTooltip",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Emulierte vertikale Synchronisation. \"Switch\" emuliert die 60Hz-Bildwiederholfrequenz der Switch. \"Unbounded\" ist eine unbegrenzte Bildwiederholfrequenz.",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Emulated Vertical Sync. 'Switch' emulates the Switch's refresh rate of 60Hz. 'Unbounded' is an unbounded refresh rate.",
|
||||
"es_ES": "",
|
||||
@@ -23376,7 +23226,7 @@
|
||||
"ID": "SettingsTabSystemVSyncModeTooltipCustom",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Emulierte vertikale Synchronisation. \"Switch\" emuliert die 60Hz-Bildwiederholfrequenz der Switch. „Unbounded“ ist eine unbegrenzte Bildwiederholfrequenz. „Benutzerdefinierte Bildwiederholfrequenz“ emuliert die angegebene benutzerdefinierte Bildwiederholfrequenz.",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Emulated Vertical Sync. 'Switch' emulates the Switch's refresh rate of 60Hz. 'Unbounded' is an unbounded refresh rate. 'Custom Refresh Rate' emulates the specified custom refresh rate.",
|
||||
"es_ES": "",
|
||||
@@ -23401,7 +23251,7 @@
|
||||
"ID": "SettingsTabSystemEnableCustomVSyncIntervalTooltip",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Ermöglicht es dem Benutzer, eine emulierte Bildwiederholfrequenz festzulegen. In einigen Titeln kann dies die Geschwindigkeit der Spiel-Logik erhöhen oder verringern. In anderen Titeln kann dies dazu führen, dass die FPS auf ein Vielfaches der Bildwiederholfrequenz begrenzt werden oder zu unvorhersehbarem Verhalten führen. Dies ist eine experimentelle Funktion, ohne Garantien dafür, wie sich das Gameplay auswirkt. \n\nLassen Sie diese Option deaktiviert, wenn Sie sich nicht sicher sind.",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Allows the user to specify an emulated refresh rate. In some titles, this may speed up or slow down the rate of gameplay logic. In other titles, it may allow for capping FPS at some multiple of the refresh rate, or lead to unpredictable behavior. This is an experimental feature, with no guarantees for how gameplay will be affected. \n\nLeave OFF if unsure.",
|
||||
"es_ES": "",
|
||||
@@ -23426,7 +23276,7 @@
|
||||
"ID": "SettingsTabSystemCustomVSyncIntervalValueTooltip",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Der Zielwert für die benutzerdefinierte Bildwiederholfrequenz.",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "The custom refresh rate target value.",
|
||||
"es_ES": "",
|
||||
@@ -23451,7 +23301,7 @@
|
||||
"ID": "SettingsTabSystemCustomVSyncIntervalSliderTooltip",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Die benutzerdefinierte Bildwiederholfrequenz als Prozentsatz der normalen Switch-Bildwiederholfrequenz.",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "The custom refresh rate, as a percentage of the normal Switch refresh rate.",
|
||||
"es_ES": "",
|
||||
@@ -23476,7 +23326,7 @@
|
||||
"ID": "SettingsTabSystemCustomVSyncIntervalPercentage",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Benutzerdefinierte Bildwiederholfrequenz %:",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Custom Refresh Rate %:",
|
||||
"es_ES": "",
|
||||
@@ -23501,7 +23351,7 @@
|
||||
"ID": "SettingsTabSystemCustomVSyncIntervalValue",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Wert für benutzerdefinierte Bildwiederholfrequenz:",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Custom Refresh Rate Value:",
|
||||
"es_ES": "",
|
||||
@@ -23551,7 +23401,7 @@
|
||||
"ID": "SettingsTabHotkeysToggleVSyncModeHotkey",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "VSync-Modus umschalten:",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Toggle VSync mode:",
|
||||
"es_ES": "",
|
||||
@@ -23576,7 +23426,7 @@
|
||||
"ID": "SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Benutzerdefinierte Bildwiederholfrequenz erhöhen:",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Raise custom refresh rate",
|
||||
"es_ES": "",
|
||||
@@ -23601,7 +23451,7 @@
|
||||
"ID": "SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Benutzerdefinierte Bildwiederholfrequenz senken:",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Lower custom refresh rate:",
|
||||
"es_ES": "",
|
||||
@@ -23626,7 +23476,7 @@
|
||||
"ID": "CompatibilityListLastUpdated",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Zuletzt aktualisiert: {0}",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Last updated: {0}",
|
||||
"es_ES": "",
|
||||
@@ -23651,7 +23501,7 @@
|
||||
"ID": "CompatibilityListWarning",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Diese Kompatibilitätsliste könnte veraltete Einträge enthalten. Teste dennoch Spiele im \"Ingame\"-Status.",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "This compatibility list might contain out of date entries.\nDo not be opposed to testing games in the \"Ingame\" status.",
|
||||
"es_ES": "",
|
||||
@@ -23676,7 +23526,7 @@
|
||||
"ID": "CompatibilityListSearchBoxWatermark",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Kompatibilitätseinträge durchsuchen...",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Search compatibility entries...",
|
||||
"es_ES": "",
|
||||
@@ -23726,7 +23576,7 @@
|
||||
"ID": "CompatibilityListOnlyShowOwnedGames",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Nur eigene Spiele anzeigen",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Only show owned games",
|
||||
"es_ES": "",
|
||||
@@ -23751,7 +23601,7 @@
|
||||
"ID": "CompatibilityListPlayable",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Spielbar",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Playable",
|
||||
"es_ES": "",
|
||||
@@ -23776,7 +23626,7 @@
|
||||
"ID": "CompatibilityListIngame",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Im Spiel",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Ingame",
|
||||
"es_ES": "",
|
||||
@@ -23951,7 +23801,7 @@
|
||||
"ID": "CompatibilityListBootsTooltip",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Startet, kommt aber nicht über den Titelbildschirm hinaus.",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Boots but does not make it past the title screen.",
|
||||
"es_ES": "",
|
||||
@@ -23976,7 +23826,7 @@
|
||||
"ID": "CompatibilityListNothingTooltip",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Startet nicht oder zeigt keine Anzeichen von Aktivität.",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Does not boot or shows no signs of activity.",
|
||||
"es_ES": "",
|
||||
@@ -24001,7 +23851,7 @@
|
||||
"ID": "ExtractAocListHeader",
|
||||
"Translations": {
|
||||
"ar_SA": "",
|
||||
"de_DE": "Wähle ein DLC zum Extrahieren aus",
|
||||
"de_DE": "",
|
||||
"el_GR": "",
|
||||
"en_US": "Select a DLC to Extract",
|
||||
"es_ES": "",
|
||||
@@ -24014,7 +23864,7 @@
|
||||
"pl_PL": "",
|
||||
"pt_BR": "Selecione um DLC para extrair",
|
||||
"ru_RU": "",
|
||||
"sv_SE": "Välj en DLC att extrahera",
|
||||
"sv_SE": "",
|
||||
"th_TH": "",
|
||||
"tr_TR": "",
|
||||
"uk_UA": "",
|
||||
|
||||
14
src/Ryujinx/Common/ThemeManager.cs
Normal file
14
src/Ryujinx/Common/ThemeManager.cs
Normal file
@@ -0,0 +1,14 @@
|
||||
using System;
|
||||
|
||||
namespace Ryujinx.Ava.Common
|
||||
{
|
||||
public static class ThemeManager
|
||||
{
|
||||
public static event Action ThemeChanged;
|
||||
|
||||
public static void OnThemeChanged()
|
||||
{
|
||||
ThemeChanged?.Invoke();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -22,8 +22,6 @@ namespace Ryujinx.Ava
|
||||
{
|
||||
public class RyujinxApp : Application
|
||||
{
|
||||
public static event Action ThemeChanged;
|
||||
|
||||
internal static string FormatTitle(LocaleKeys? windowTitleKey = null, bool includeVersion = true)
|
||||
=> windowTitleKey is null
|
||||
? $"{FullAppName}{(includeVersion ? $" {Program.Version}" : string.Empty)}"
|
||||
@@ -114,7 +112,7 @@ namespace Ryujinx.Ava
|
||||
baseStyle = ConfigurationState.Instance.UI.BaseStyle;
|
||||
}
|
||||
|
||||
ThemeChanged?.Invoke();
|
||||
ThemeManager.OnThemeChanged();
|
||||
|
||||
RequestedThemeVariant = baseStyle switch
|
||||
{
|
||||
|
||||
@@ -25,10 +25,10 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
Version = RyujinxApp.FullAppName + "\n" + Program.Version;
|
||||
UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value);
|
||||
|
||||
RyujinxApp.ThemeChanged += Ryujinx_ThemeChanged;
|
||||
ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;
|
||||
}
|
||||
|
||||
private void Ryujinx_ThemeChanged()
|
||||
private void ThemeManager_ThemeChanged()
|
||||
{
|
||||
Dispatcher.UIThread.Post(() => UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value));
|
||||
}
|
||||
@@ -49,7 +49,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
RyujinxApp.ThemeChanged -= Ryujinx_ThemeChanged;
|
||||
ThemeManager.ThemeChanged -= ThemeManager_ThemeChanged;
|
||||
|
||||
GithubLogo.Dispose();
|
||||
DiscordLogo.Dispose();
|
||||
|
||||
@@ -128,8 +128,6 @@ 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;
|
||||
@@ -483,7 +481,6 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
ShowTitleBar = config.ShowTitleBar;
|
||||
HideCursor = (int)config.HideCursor.Value;
|
||||
UpdateCheckerType = (int)config.UpdateCheckerType.Value;
|
||||
FocusLostActionType = (int)config.FocusLostActionType.Value;
|
||||
|
||||
GameDirectories.Clear();
|
||||
GameDirectories.AddRange(config.UI.GameDirs.Value);
|
||||
@@ -592,7 +589,6 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||
config.ShowTitleBar.Value = ShowTitleBar;
|
||||
config.HideCursor.Value = (HideCursorMode)HideCursor;
|
||||
config.UpdateCheckerType.Value = (UpdaterType)UpdateCheckerType;
|
||||
config.FocusLostActionType.Value = (FocusLostType)FocusLostActionType;
|
||||
|
||||
if (GameDirectoryChanged)
|
||||
{
|
||||
|
||||
@@ -37,33 +37,12 @@
|
||||
<CheckBox IsChecked="{Binding RememberWindowState}">
|
||||
<TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
|
||||
</CheckBox>
|
||||
<CheckBox IsChecked="{Binding DisableInputWhenOutOfFocus}">
|
||||
<TextBlock Text="{ext:Locale SettingsTabGeneralDisableInputWhenOutOfFocus}" />
|
||||
</CheckBox>
|
||||
<CheckBox IsChecked="{Binding ShowTitleBar}" IsVisible="{x:Static helper:RunningPlatform.IsWindows}">
|
||||
<TextBlock Text="{ext:Locale SettingsTabGeneralShowTitleBar}" />
|
||||
</CheckBox>
|
||||
<StackPanel Margin="0, 15, 0, 0" Orientation="Horizontal">
|
||||
<TextBlock VerticalAlignment="Center"
|
||||
Text="{ext:Locale SettingsTabGeneralFocusLossType}"
|
||||
Width="150" />
|
||||
<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>
|
||||
</ComboBox>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0, 15, 0, 0" Orientation="Horizontal">
|
||||
<TextBlock VerticalAlignment="Center"
|
||||
Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunch}"
|
||||
|
||||
@@ -765,116 +765,31 @@ namespace Ryujinx.Ava.UI.Windows
|
||||
|
||||
private void InputElement_OnGotFocus(object sender, GotFocusEventArgs e)
|
||||
{
|
||||
if (ViewModel.AppHost is null) return;
|
||||
|
||||
if (!_focusLoss.Active)
|
||||
if (!_didDisableInputUpdates)
|
||||
return;
|
||||
|
||||
switch (_focusLoss.Type)
|
||||
{
|
||||
case FocusLostType.BlockInput:
|
||||
{
|
||||
if (!ViewModel.AppHost.NpadManager.InputUpdatesBlocked)
|
||||
{
|
||||
_focusLoss = default;
|
||||
return;
|
||||
}
|
||||
if (!ConfigurationState.Instance.Hid.DisableInputWhenOutOfFocus)
|
||||
return;
|
||||
|
||||
ViewModel.AppHost.NpadManager.UnblockInputUpdates();
|
||||
_focusLoss = default;
|
||||
break;
|
||||
}
|
||||
case FocusLostType.MuteAudio:
|
||||
{
|
||||
if (!ViewModel.AppHost.Device.IsAudioMuted())
|
||||
{
|
||||
_focusLoss = default;
|
||||
return;
|
||||
}
|
||||
|
||||
ViewModel.AppHost.Device.SetVolume(ViewModel.VolumeBeforeMute);
|
||||
|
||||
_focusLoss = default;
|
||||
break;
|
||||
}
|
||||
case FocusLostType.BlockInputAndMuteAudio:
|
||||
{
|
||||
if (!ViewModel.AppHost.Device.IsAudioMuted())
|
||||
goto case FocusLostType.BlockInput;
|
||||
|
||||
ViewModel.AppHost.Device.SetVolume(ViewModel.VolumeBeforeMute);
|
||||
ViewModel.AppHost.NpadManager.UnblockInputUpdates();
|
||||
|
||||
_focusLoss = default;
|
||||
break;
|
||||
}
|
||||
case FocusLostType.PauseEmulation:
|
||||
{
|
||||
if (!ViewModel.AppHost.Device.System.IsPaused)
|
||||
{
|
||||
_focusLoss = default;
|
||||
return;
|
||||
}
|
||||
|
||||
ViewModel.AppHost.Resume();
|
||||
|
||||
_focusLoss = default;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (ViewModel.AppHost is not { NpadManager.InputUpdatesBlocked: true } appHost)
|
||||
return;
|
||||
|
||||
appHost.NpadManager.UnblockInputUpdates();
|
||||
_didDisableInputUpdates = appHost.NpadManager.InputUpdatesBlocked;
|
||||
}
|
||||
|
||||
private (FocusLostType Type, bool Active) _focusLoss;
|
||||
|
||||
private bool _didDisableInputUpdates;
|
||||
|
||||
private void InputElement_OnLostFocus(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (ConfigurationState.Instance.FocusLostActionType.Value is FocusLostType.DoNothing)
|
||||
if (!ConfigurationState.Instance.Hid.DisableInputWhenOutOfFocus)
|
||||
return;
|
||||
|
||||
if (ViewModel.AppHost is null) return;
|
||||
|
||||
switch (ConfigurationState.Instance.FocusLostActionType.Value)
|
||||
{
|
||||
case FocusLostType.BlockInput:
|
||||
{
|
||||
if (ViewModel.AppHost.NpadManager.InputUpdatesBlocked)
|
||||
return;
|
||||
if (ViewModel.AppHost is not { NpadManager.InputUpdatesBlocked: false } appHost)
|
||||
return;
|
||||
|
||||
ViewModel.AppHost.NpadManager.BlockInputUpdates();
|
||||
_focusLoss = (FocusLostType.BlockInput, ViewModel.AppHost.NpadManager.InputUpdatesBlocked);
|
||||
break;
|
||||
}
|
||||
case FocusLostType.MuteAudio:
|
||||
{
|
||||
if (ViewModel.AppHost.Device.GetVolume() is 0)
|
||||
return;
|
||||
|
||||
ViewModel.VolumeBeforeMute = ViewModel.AppHost.Device.GetVolume();
|
||||
ViewModel.AppHost.Device.SetVolume(0);
|
||||
_focusLoss = (FocusLostType.MuteAudio, ViewModel.AppHost.Device.GetVolume() is 0f);
|
||||
break;
|
||||
}
|
||||
case FocusLostType.BlockInputAndMuteAudio:
|
||||
{
|
||||
if (ViewModel.AppHost.Device.GetVolume() is 0)
|
||||
goto case FocusLostType.BlockInput;
|
||||
|
||||
ViewModel.VolumeBeforeMute = ViewModel.AppHost.Device.GetVolume();
|
||||
ViewModel.AppHost.Device.SetVolume(0);
|
||||
ViewModel.AppHost.NpadManager.BlockInputUpdates();
|
||||
_focusLoss = (FocusLostType.BlockInputAndMuteAudio, ViewModel.AppHost.Device.GetVolume() is 0f && ViewModel.AppHost.NpadManager.InputUpdatesBlocked);
|
||||
break;
|
||||
}
|
||||
case FocusLostType.PauseEmulation:
|
||||
{
|
||||
if (ViewModel.AppHost.Device.System.IsPaused)
|
||||
return;
|
||||
|
||||
ViewModel.AppHost.Pause();
|
||||
_focusLoss = (FocusLostType.PauseEmulation, ViewModel.AppHost.Device.System.IsPaused);
|
||||
break;
|
||||
}
|
||||
}
|
||||
appHost.NpadManager.BlockInputUpdates();
|
||||
_didDisableInputUpdates = appHost.NpadManager.InputUpdatesBlocked;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
|
||||
/// <summary>
|
||||
/// The current version of the file format
|
||||
/// </summary>
|
||||
public const int CurrentVersion = 67;
|
||||
public const int CurrentVersion = 66;
|
||||
|
||||
/// <summary>
|
||||
/// Version of the configuration file format
|
||||
@@ -171,11 +171,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
|
||||
/// Checks for updates when Ryujinx starts when enabled, either prompting when an update is found or just showing a notification.
|
||||
/// </summary>
|
||||
public UpdaterType UpdateCheckerType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// How the emulator should behave when you click off/on the window.
|
||||
/// </summary>
|
||||
public FocusLostType FocusLostActionType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Show "Confirm Exit" Dialog
|
||||
|
||||
@@ -46,7 +46,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
|
||||
EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
|
||||
CheckUpdatesOnStart.Value = cff.CheckUpdatesOnStart;
|
||||
UpdateCheckerType.Value = cff.UpdateCheckerType;
|
||||
FocusLostActionType.Value = cff.FocusLostActionType;
|
||||
ShowConfirmExit.Value = cff.ShowConfirmExit;
|
||||
RememberWindowState.Value = cff.RememberWindowState;
|
||||
ShowTitleBar.Value = cff.ShowTitleBar;
|
||||
@@ -436,8 +435,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
|
||||
(63, static cff => cff.MatchSystemTime = false),
|
||||
(64, static cff => cff.LoggingEnableAvalonia = false),
|
||||
(65, static cff => cff.UpdateCheckerType = cff.CheckUpdatesOnStart ? UpdaterType.PromptAtStartup : UpdaterType.Off),
|
||||
(66, static cff => cff.DisableInputWhenOutOfFocus = false),
|
||||
(67, static cff => cff.FocusLostActionType = cff.DisableInputWhenOutOfFocus ? FocusLostType.BlockInput : FocusLostType.DoNothing)
|
||||
(66, static cff => cff.DisableInputWhenOutOfFocus = false)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -779,11 +779,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
|
||||
/// Checks for updates when Ryujinx starts when enabled, either prompting when an update is found or just showing a notification.
|
||||
/// </summary>
|
||||
public ReactiveObject<UpdaterType> UpdateCheckerType { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// How the emulator should behave when you click off/on the window.
|
||||
/// </summary>
|
||||
public ReactiveObject<FocusLostType> FocusLostActionType { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// Show "Confirm Exit" Dialog
|
||||
@@ -822,7 +817,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
|
||||
EnableDiscordIntegration = new ReactiveObject<bool>();
|
||||
CheckUpdatesOnStart = new ReactiveObject<bool>();
|
||||
UpdateCheckerType = new ReactiveObject<UpdaterType>();
|
||||
FocusLostActionType = new ReactiveObject<FocusLostType>();
|
||||
ShowConfirmExit = new ReactiveObject<bool>();
|
||||
RememberWindowState = new ReactiveObject<bool>();
|
||||
ShowTitleBar = new ReactiveObject<bool>();
|
||||
|
||||
@@ -57,7 +57,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
|
||||
EnableDiscordIntegration = EnableDiscordIntegration,
|
||||
CheckUpdatesOnStart = CheckUpdatesOnStart,
|
||||
UpdateCheckerType = UpdateCheckerType,
|
||||
FocusLostActionType = FocusLostActionType,
|
||||
ShowConfirmExit = ShowConfirmExit,
|
||||
RememberWindowState = RememberWindowState,
|
||||
ShowTitleBar = ShowTitleBar,
|
||||
@@ -179,7 +178,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
|
||||
System.EnableDockedMode.Value = true;
|
||||
EnableDiscordIntegration.Value = true;
|
||||
UpdateCheckerType.Value = UpdaterType.PromptAtStartup;
|
||||
FocusLostActionType.Value = FocusLostType.DoNothing;
|
||||
ShowConfirmExit.Value = true;
|
||||
RememberWindowState.Value = true;
|
||||
ShowTitleBar.Value = !OperatingSystem.IsWindows();
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
using Ryujinx.Common.Utilities;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace Ryujinx.Ava.Utilities.Configuration.UI
|
||||
{
|
||||
[JsonConverter(typeof(TypedStringEnumConverter<FocusLostType>))]
|
||||
public enum FocusLostType
|
||||
{
|
||||
DoNothing,
|
||||
BlockInput,
|
||||
MuteAudio,
|
||||
BlockInputAndMuteAudio,
|
||||
PauseEmulation
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user