Superredstone/Kenji-NX
1
0
Fork 0
mirror of https://git.ryujinx.app/projects/Kenji-NX.git synced 2026-10-09 22:08:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

UI: Update Avalonia to v12.1

Browse Source 
- Avalonia to 12.1.1

- FluentAvalonia to 3.0.2

- Move DevTools Ctrl+F12 keybind to app initialization
This commit is contained in:
KeatonTheBot
2026-08-16 16:37:27 -05:00
parent 0e5fead0f9
commit 47e55acf21
66 changed files with 315 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
+1 -1
View File
@@ -79,7 +79,7 @@ namespace Ryujinx.Ava.UI.Applet
LocaleManager.Instance[LocaleKeys.DialogOpenSettingsWindowLabel],
"",
LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
(int)Symbol.Important,
(int)FASymbol.Important,
deferEvent,
async window =>
{
src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml.cs
+4 -4
View File
@@ -70,16 +70,16 @@ namespace Ryujinx.Ava.UI.Applet
public static async Task<UserResult> ShowControllerAppletDialog(MainWindow window, ControllerAppletUIArgs args)
{
ContentDialog contentDialog = new();
FAContentDialog contentDialog = new();
UserResult result = UserResult.Cancel;
ControllerAppletDialog content = new(window, args);
contentDialog.Title = LocaleManager.Instance[LocaleKeys.DialogControllerAppletTitle];
contentDialog.Content = content;
void Handler(ContentDialog sender, ContentDialogClosedEventArgs eventArgs)
void Handler(FAContentDialog sender, FAContentDialogClosedEventArgs eventArgs)
{
if (eventArgs.Result == ContentDialogResult.Primary)
if (eventArgs.Result == FAContentDialogResult.Primary)
{
result = UserResult.Ok;
}
@@ -130,7 +130,7 @@ namespace Ryujinx.Ava.UI.Applet
public void Close()
{
((ContentDialog)Parent)?.Hide();
((FAContentDialog)Parent)?.Hide();
}
}
}
src/Ryujinx/UI/Applet/SwkbdAppletDialog.axaml
+1 -1
View File
@@ -46,7 +46,7 @@
Text="{Binding Message}"
TextInput="Message_TextInput"
TextWrapping="Wrap"
UseFloatingWatermark="True" />
UseFloatingPlaceholder="True" />
<TextBlock
Name="Error"
Grid.Row="4"
src/Ryujinx/UI/Applet/SwkbdAppletDialog.axaml.cs
+9 -9
View File
@@ -21,7 +21,7 @@ namespace Ryujinx.Ava.UI.Controls
private int _inputMin;
private readonly string _placeholder;
private ContentDialog _host;
private FAContentDialog _host;
public SwkbdAppletDialog(string mainText, string secondaryText, string placeholder, string message)
{
@@ -32,11 +32,11 @@ namespace Ryujinx.Ava.UI.Controls
_placeholder = placeholder;
InitializeComponent();
Input.Watermark = _placeholder;
Input.PlaceholderText = _placeholder;
if (string.IsNullOrWhiteSpace(Input.Watermark))
if (string.IsNullOrWhiteSpace(Input.PlaceholderText))
{
Input.UseFloatingWatermark = false;
Input.UseFloatingPlaceholder = false;
}
Input.AddHandler(TextInputEvent, Message_TextInput, RoutingStrategies.Tunnel, true);
@@ -48,7 +48,7 @@ namespace Ryujinx.Ava.UI.Controls
InitializeComponent();
}
protected override void OnGotFocus(GotFocusEventArgs e)
protected override void OnGotFocus(FocusChangedEventArgs e)
{
// FIXME: This does not work. Might be a bug in Avalonia with DialogHost
// Currently focus will be redirected to the overlay window instead.
@@ -61,7 +61,7 @@ namespace Ryujinx.Ava.UI.Controls
public static async Task<(UserResult Result, string Input)> ShowInputDialog(string title, SoftwareKeyboardUIArgs args)
{
ContentDialog contentDialog = new();
FAContentDialog contentDialog = new();
UserResult result = UserResult.Cancel;
@@ -80,9 +80,9 @@ namespace Ryujinx.Ava.UI.Controls
contentDialog.CloseButtonText = LocaleManager.Instance[LocaleKeys.InputDialogCancel];
contentDialog.Content = content;
void Handler(ContentDialog sender, ContentDialogClosedEventArgs eventArgs)
void Handler(FAContentDialog sender, FAContentDialogClosedEventArgs eventArgs)
{
if (eventArgs.Result == ContentDialogResult.Primary)
if (eventArgs.Result == FAContentDialogResult.Primary)
{
result = UserResult.Ok;
input = content.Input.Text;
@@ -174,7 +174,7 @@ namespace Ryujinx.Ava.UI.Controls
{
if (e.Key == Key.Enter && _host.IsPrimaryButtonEnabled)
{
_host.Hide(ContentDialogResult.Primary);
_host.Hide(FAContentDialogResult.Primary);
}
else
{