Creepso/ryujinx_ryubing
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-04-21 14:11:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch ryujinx:master into ui-userprofiles-and-misc

Browse source
This commit is contained in:
Neo 2025-11-08 10:01:40 -06:00
commit 9b82e8452f
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
assets/locales.json
View file

@ -3513,7 +3513,7 @@
"th_TH": "บล็อกข้อมูล & ปิดเสียง", "th_TH": "บล็อกข้อมูล & ปิดเสียง",
"tr_TR": "Girişi engelle & sesi kapat", "tr_TR": "Girişi engelle & sesi kapat",
"uk_UA": "Блокувати введення & вимкнути звук", "uk_UA": "Блокувати введення & вимкнути звук",
"zh_CN": "阻止输入 & 静音", "zh_CN": "阻止输入并静音",
"zh_TW": "停用輸入 & 靜音" "zh_TW": "停用輸入 & 靜音"
} }
}, },
@ -14538,7 +14538,7 @@
"th_TH": "", "th_TH": "",
"tr_TR": "", "tr_TR": "",
"uk_UA": "", "uk_UA": "",
"zh_CN": "", "zh_CN": "已启用 {0} DRAM",
"zh_TW": "將使用 {0} DRAM" "zh_TW": "將使用 {0} DRAM"
} }
}, },
@ -14563,7 +14563,7 @@
"th_TH": "", "th_TH": "",
"tr_TR": "", "tr_TR": "",
"uk_UA": "", "uk_UA": "",
"zh_CN": "", "zh_CN": "启用 4GiB 以上的 DRAM 可能导致某些应用程序崩溃。",
"zh_TW": "使用超過 4GiB DRAM 有機會於模擬某些應用程式時停止運作。" "zh_TW": "使用超過 4GiB DRAM 有機會於模擬某些應用程式時停止運作。"
} }
}, },
@ -14588,7 +14588,7 @@
"th_TH": "", "th_TH": "",
"tr_TR": "", "tr_TR": "",
"uk_UA": "", "uk_UA": "",
"zh_CN": "", "zh_CN": "调试: 已开启 GDB Stub (端口: {0})",
"zh_TW": "偵錯：已啟用 GDB Stub (通訊埠：{0})" "zh_TW": "偵錯：已啟用 GDB Stub (通訊埠：{0})"
} }
}, },
@ -14613,7 +14613,7 @@
"th_TH": "", "th_TH": "",
"tr_TR": "", "tr_TR": "",
"uk_UA": "", "uk_UA": "",
"zh_CN": "", "zh_CN": "这会影响性能",
"zh_TW": "啟用此選項會影響效能。" "zh_TW": "啟用此選項會影響效能。"
} }
}, },
@ -14638,7 +14638,7 @@
"th_TH": "", "th_TH": "",
"tr_TR": "", "tr_TR": "",
"uk_UA": "", "uk_UA": "",
"zh_CN": "", "zh_CN": "调试: 已开启启动时暂停",
"zh_TW": "偵錯：已啟用執行時暫停應用程式" "zh_TW": "偵錯：已啟用執行時暫停應用程式"
} }
}, },
@ -14663,7 +14663,7 @@
"th_TH": "", "th_TH": "",
"tr_TR": "", "tr_TR": "",
"uk_UA": "", "uk_UA": "",
"zh_CN": "", "zh_CN": "应用程序已被暂停。请附加一个调试器继续。",
"zh_TW": "應用程式已暫停。附加偵錯器以繼續。" "zh_TW": "應用程式已暫停。附加偵錯器以繼續。"
} }
}, },

4
src/Ryujinx/UI/Windows/MainWindow.axaml
View file

@ -23,8 +23,8 @@
mc:Ignorable="d" mc:Ignorable="d"
WindowStartupLocation="Manual" WindowStartupLocation="Manual"
Focusable="True" Focusable="True"
GotFocus="InputElement_OnGotFocus" GotFocus="AppWindow_OnGotFocus"
LostFocus="InputElement_OnLostFocus"> LostFocus="AppWindow_OnLostFocus">
<Window.Styles> <Window.Styles>
<Style Selector="TitleBar:fullscreen"> <Style Selector="TitleBar:fullscreen">
<Setter Property="Background" Value="#000000" /> <Setter Property="Background" Value="#000000" />

4
src/Ryujinx/UI/Windows/MainWindow.axaml.cs
View file

@ -771,7 +771,7 @@ namespace Ryujinx.Ava.UI.Windows
_intelMacWarningShown = true; _intelMacWarningShown = true;
} }
private void InputElement_OnGotFocus(object sender, GotFocusEventArgs e) private void AppWindow_OnGotFocus(object sender, GotFocusEventArgs e)
{ {
if (ViewModel.AppHost is null) if (ViewModel.AppHost is null)
return; return;
@ -835,7 +835,7 @@ namespace Ryujinx.Ava.UI.Windows
private (FocusLostType Type, bool Active) _focusLoss; private (FocusLostType Type, bool Active) _focusLoss;
private void InputElement_OnLostFocus(object sender, RoutedEventArgs e) private void AppWindow_OnLostFocus(object sender, RoutedEventArgs e)
{ {
if (ConfigurationState.Instance.FocusLostActionType.Value is FocusLostType.DoNothing) if (ConfigurationState.Instance.FocusLostActionType.Value is FocusLostType.DoNothing)
return; return;