From 49cbe4b328d97833e75edccfeea0cf33e797b20f Mon Sep 17 00:00:00 2001 From: GreemDev Date: Fri, 24 Oct 2025 18:24:23 -0500 Subject: [PATCH 1/2] UI: fix "Enable UI logs" not being persisted upon relaunch Closes ryujinx#5 (it was saved, just not loaded back) --- src/Ryujinx/Program.cs | 5 +---- .../Systems/Configuration/ConfigurationState.Migration.cs | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs index ecf6779dc..509a9f18e 100644 --- a/src/Ryujinx/Program.cs +++ b/src/Ryujinx/Program.cs @@ -221,10 +221,7 @@ namespace Ryujinx.Ava } // When you first load the program, copy to remember the path for the global configuration - if (GlobalConfigurationPath == null) - { - GlobalConfigurationPath = ConfigurationPath; - } + GlobalConfigurationPath ??= ConfigurationPath; UseHardwareAcceleration = ConfigurationState.Instance.EnableHardwareAcceleration; diff --git a/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs b/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs index 57619aa70..a91a74711 100644 --- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs +++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs @@ -56,6 +56,7 @@ namespace Ryujinx.Ava.Systems.Configuration Logger.EnableFileLog.Value = cff.EnableFileLog; Logger.EnableDebug.Value = cff.LoggingEnableDebug; + Logger.EnableAvaloniaLog.Value = cff.LoggingEnableAvalonia; Logger.EnableStub.Value = cff.LoggingEnableStub; Logger.EnableInfo.Value = cff.LoggingEnableInfo; Logger.EnableWarn.Value = cff.LoggingEnableWarn; From c6bc77e4bf70df4fd90db07762d8cef5050f3e45 Mon Sep 17 00:00:00 2001 From: KeatonTheBot Date: Sat, 25 Oct 2025 00:29:51 -0500 Subject: [PATCH 2/2] UI: Update Avalonia to 11.3.6, FluentAvalonia to 2.4.0 (ryubing/ryujinx!118) See merge request ryubing/ryujinx!118 --- Directory.Packages.props | 22 +-- src/Ryujinx/Ryujinx.csproj | 6 +- .../UI/Views/Settings/SettingsAudioView.axaml | 23 ++- .../UI/Views/Settings/SettingsCPUView.axaml | 17 +- .../Views/Settings/SettingsGraphicsView.axaml | 159 +++++++--------- .../Views/Settings/SettingsLoggingView.axaml | 21 +-- .../Views/Settings/SettingsNetworkView.axaml | 15 +- .../Views/Settings/SettingsSystemView.axaml | 170 +++++++----------- .../UI/Views/Settings/SettingsUIView.axaml | 72 +++----- .../UI/Views/User/UserEditorView.axaml | 20 ++- .../UI/Views/User/UserSaveManagerView.axaml | 45 ++--- .../UI/Views/User/UserSelectorView.axaml | 15 +- 12 files changed, 243 insertions(+), 342 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1389b58a6..4c3d5bcd3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,25 +3,25 @@ true - - - - - - - + + + + + + + - - - + + + - + diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj index 480d14781..3d40ae64e 100644 --- a/src/Ryujinx/Ryujinx.csproj +++ b/src/Ryujinx/Ryujinx.csproj @@ -51,10 +51,10 @@ - - + + - + diff --git a/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml index 4f1701c48..b09c6ef6c 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml @@ -35,18 +35,17 @@ Width="350" ToolTip.Tip="{ext:Locale AudioBackendTooltip}" HorizontalContentAlignment="Left"> - - - - - - - - - - - - + + + + diff --git a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml index 0be13d9a5..2424aca97 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml @@ -55,19 +55,14 @@ HorizontalContentAlignment="Left" Width="350"> - - + ToolTip.Tip="{ext:Locale MemoryManagerSoftwareTooltip}" + Content="{ext:Locale SettingsTabSystemMemoryManagerModeSoftware}" /> - - + ToolTip.Tip="{ext:Locale MemoryManagerHostTooltip}" + Content="{ext:Locale SettingsTabSystemMemoryManagerModeHost}" /> - - + ToolTip.Tip="{ext:Locale MemoryManagerUnsafeTooltip}" + Content="{ext:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" /> - - - - - - + + @@ -65,15 +65,12 @@ HorizontalContentAlignment="Left" ToolTip.Tip="{ext:Locale GalThreadingTooltip}" SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}"> - - - - - - - - - + + + @@ -108,21 +105,16 @@ Width="350" HorizontalContentAlignment="Left" ToolTip.Tip="{ext:Locale ResolutionScaleTooltip}"> - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + @@ -184,18 +170,14 @@ HorizontalContentAlignment="Left" ToolTip.Tip="{ext:Locale GraphicsScalingFilterTooltip}" SelectedIndex="{Binding ScalingFilter}"> - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - + + + + + @@ -254,24 +229,18 @@ Width="350" HorizontalContentAlignment="Left" ToolTip.Tip="{ext:Locale AspectRatioTooltip}"> - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml index d28f0ffa7..fa3b4e866 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml @@ -101,19 +101,14 @@ Width="150" HorizontalContentAlignment="Left" ToolTip.Tip="{ext:Locale OpenGlLogLevel}"> - - - - - - - - - - - - + + + + diff --git a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml index 2fc59f04d..3a249e097 100644 --- a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml +++ b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml @@ -33,15 +33,12 @@ ToolTip.Tip="{ext:Locale MultiplayerModeTooltip}" HorizontalContentAlignment="Left" Width="250"> - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + - - - - - - + + - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - + + + + + - - - - - - - - - + + + @@ -122,15 +112,12 @@ - - - - - - - - - + + + - - - - - - - - - + + + diff --git a/src/Ryujinx/UI/Views/User/UserEditorView.axaml b/src/Ryujinx/UI/Views/User/UserEditorView.axaml index 47f6a60e1..b8983489a 100644 --- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml +++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml @@ -92,20 +92,24 @@ Spacing="10"> diff --git a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml index f742af9ed..80fb442e5 100644 --- a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml +++ b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml @@ -22,44 +22,33 @@ - - - - - + + + - - - - - + + +