From ae8a0c14494e3b0ac8c4dd55a05afeddfae7cdcb Mon Sep 17 00:00:00 2001 From: KeatonTheBot Date: Fri, 30 Jan 2026 09:25:46 -0600 Subject: [PATCH 1/2] UI: Restore FluentAvaloniaUI package, disable animations on app initialization * Avalonia's built-in color picker is now used when selecting a firmware avatar * Update Avalonia to 11.3.11, Svg.Controls.Avalonia group to 11.3.9.2, FluentAvalonia to 2.5.0 --- Directory.Packages.props | 16 ++++++++-------- src/Ryujinx/Ryujinx.csproj | 2 +- src/Ryujinx/UI/RyujinxApp.axaml.cs | 4 ++++ src/Ryujinx/UI/Views/Input/LedInputView.axaml | 13 ++++--------- src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs | 9 ++++----- .../User/UserFirmwareAvatarSelectorView.axaml | 14 ++++---------- 6 files changed, 25 insertions(+), 33 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 7f437a93a..b3af9ee9b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,13 +3,13 @@ true - - - - - - - + + + + + + + @@ -22,7 +22,7 @@ - + diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj index 715460274..489b2c313 100644 --- a/src/Ryujinx/Ryujinx.csproj +++ b/src/Ryujinx/Ryujinx.csproj @@ -49,7 +49,7 @@ - + diff --git a/src/Ryujinx/UI/RyujinxApp.axaml.cs b/src/Ryujinx/UI/RyujinxApp.axaml.cs index c778f27fb..22b98dea7 100644 --- a/src/Ryujinx/UI/RyujinxApp.axaml.cs +++ b/src/Ryujinx/UI/RyujinxApp.axaml.cs @@ -5,6 +5,7 @@ using Avalonia.Markup.Xaml; using Avalonia.Platform; using Avalonia.Styling; using Avalonia.Threading; +using FluentAvalonia.Core; using FluentAvalonia.UI.Windowing; using Gommon; using Ryujinx.Ava.Common.Locale; @@ -53,6 +54,9 @@ namespace Ryujinx.Ava { Name = FormatTitle(); + // Disable menu animations + FAUISettings.SetAnimationsEnabledAtAppLevel(false); + AvaloniaXamlLoader.Load(this); if (OperatingSystem.IsMacOS()) diff --git a/src/Ryujinx/UI/Views/Input/LedInputView.axaml b/src/Ryujinx/UI/Views/Input/LedInputView.axaml index c6319f424..327f27718 100644 --- a/src/Ryujinx/UI/Views/Input/LedInputView.axaml +++ b/src/Ryujinx/UI/Views/Input/LedInputView.axaml @@ -47,18 +47,13 @@ - - + diff --git a/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs b/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs index dab553f82..d0407beb3 100644 --- a/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs +++ b/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs @@ -1,4 +1,5 @@ using Avalonia; +using Avalonia.Controls; using FluentAvalonia.UI.Controls; using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.UI.Controls; @@ -30,19 +31,17 @@ namespace Ryujinx.UI.Views.Input InitializeComponent(); } - private void ColorPickerButton_OnColorChanged(ColorPickerButton sender, ColorButtonColorChangedEventArgs args) + private void ColorPicker_OnColorChanged(object sender, ColorChangedEventArgs args) { - if (!args.NewColor.HasValue) - return; if (!ViewModel.EnableLedChanging) return; if (ViewModel.TurnOffLed) return; - ViewModel.ParentModel.SelectedGamepad.SetLed(args.NewColor.Value.ToUInt32()); + ViewModel.ParentModel.SelectedGamepad.SetLed(args.NewColor.ToUInt32()); } - private void ColorPickerButton_OnAttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e) + private void ColorPicker_OnAttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e) { if (!ViewModel.EnableLedChanging) return; diff --git a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml index c22624fd5..9028d5802 100644 --- a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml +++ b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml @@ -78,22 +78,16 @@ Spacing="10" Margin="0 24 0 0" HorizontalAlignment="Right"> - - + - - + +