diff --git a/LICENSES/Apache-2.0.txt b/LICENSES/Apache-2.0.txt
new file mode 100644
index 00000000..d6456956
--- /dev/null
+++ b/LICENSES/Apache-2.0.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/REUSE.toml b/REUSE.toml
index 7c66ab06..f25a1f09 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -19,6 +19,12 @@ precedence = "aggregate"
SPDX-FileCopyrightText = "SharpEmu Emulator Project"
SPDX-License-Identifier = "GPL-2.0-or-later"
+[[annotations]]
+path = "src/SharpEmu.GUI/Assets/Fonts/MaterialSymbolsRounded-*.ttf"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2026 Google LLC"
+SPDX-License-Identifier = "Apache-2.0"
+
[[annotations]]
path = "src/SharpEmu.LibAtrac9/**"
precedence = "aggregate"
diff --git a/src/SharpEmu.GUI/App.axaml b/src/SharpEmu.GUI/App.axaml
index 49418077..2af46780 100644
--- a/src/SharpEmu.GUI/App.axaml
+++ b/src/SharpEmu.GUI/App.axaml
@@ -15,6 +15,8 @@ cascade order so individual launcher views do not redefine global visuals.
+
+
@@ -29,5 +31,6 @@ cascade order so individual launcher views do not redefine global visuals.
+
diff --git a/src/SharpEmu.GUI/Assets/Fonts/MaterialSymbolsRounded-400.ttf b/src/SharpEmu.GUI/Assets/Fonts/MaterialSymbolsRounded-400.ttf
new file mode 100644
index 00000000..26defcff
Binary files /dev/null and b/src/SharpEmu.GUI/Assets/Fonts/MaterialSymbolsRounded-400.ttf differ
diff --git a/src/SharpEmu.GUI/Controls/Settings/SplitNumericUpDown.cs b/src/SharpEmu.GUI/Controls/Settings/SplitNumericUpDown.cs
new file mode 100644
index 00000000..f3792f52
--- /dev/null
+++ b/src/SharpEmu.GUI/Controls/Settings/SplitNumericUpDown.cs
@@ -0,0 +1,11 @@
+// Copyright (C) 2026 SharpEmu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+using Avalonia.Controls;
+
+namespace SharpEmu.GUI.Controls.Settings;
+
+///
+/// Numeric input whose native spinner is presented as a separate split button
+///
+public sealed class SplitNumericUpDown : NumericUpDown;
diff --git a/src/SharpEmu.GUI/MainWindow.axaml b/src/SharpEmu.GUI/MainWindow.axaml
index 18d3ebaa..5c2a27e3 100644
--- a/src/SharpEmu.GUI/MainWindow.axaml
+++ b/src/SharpEmu.GUI/MainWindow.axaml
@@ -6,6 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ VerticalAlignment="Center" />
+ Classes="optionToggle" />
+
+
-
-
-
-
+
+
+
+
-
+ VerticalAlignment="Center" />
-
+
+ Classes="optionToggle" />
-
+
+ Classes="optionToggle" />
+
+
-
-
-
-
+
+
+
+
-
+
@@ -428,313 +536,282 @@ SPDX-License-Identifier: GPL-2.0-or-later
+ Classes="optionToggle"
+ IsChecked="True" />
+ Classes="optionToggle" />
+ Classes="optionToggle"
+ IsChecked="True" />
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+ FontSize="14"
+ FontWeight="Medium" />
+ FontSize="11"
+ Foreground="{StaticResource MutedBrush}"
+ TextWrapping="Wrap" />
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
+ FontSize="14"
+ FontWeight="Medium" />
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+ Text="{Binding [About.Github.Label], Source={x:Static local:Localization.Instance}}"
+ FontSize="14"
+ FontWeight="Medium" />
+ Text="{Binding [About.Github.Desc], Source={x:Static local:Localization.Instance}}"
+ FontSize="11"
+ Foreground="{StaticResource MutedBrush}"
+ TextWrapping="Wrap" />
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+ FontSize="14"
+ FontWeight="Medium" />
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
+ VerticalAlignment="Center" />
-
-
-
+
+
-
+ VerticalAlignment="Center" />
-
+
-
+
-
+
-
+ VerticalAlignment="Center" />
-
+
-
+ VerticalAlignment="Center" />
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
@@ -742,8 +819,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
-
-
+
+
diff --git a/src/SharpEmu.GUI/MainWindow.axaml.cs b/src/SharpEmu.GUI/MainWindow.axaml.cs
index 17ea4abf..11607290 100644
--- a/src/SharpEmu.GUI/MainWindow.axaml.cs
+++ b/src/SharpEmu.GUI/MainWindow.axaml.cs
@@ -102,6 +102,7 @@ public partial class MainWindow : Window
private bool _isStopping;
private int _autoScrollTicks;
private int _activePageIndex;
+ private int _optionsSectionIndex;
private Updater.UpdateInfo? _availableUpdate;
private string _updateStatusKey = "Updater.Status.Ready";
private object?[] _updateStatusArgs = [BuildInfo.CommitSha ?? "dev"];
@@ -217,6 +218,7 @@ public partial class MainWindow : Window
LibraryTabButton.Click += (_, _) => SetActivePage(0);
OptionsTabButton.Click += (_, _) => SetActivePage(1);
ConsoleToggle.IsCheckedChanged += (_, _) => ConsolePanel.IsVisible = ConsoleToggle.IsChecked == true && _consoleWindow is null;
+ WireOptionsNavigation();
// The settings page edits _settings live, so a launch started while
// it is open already uses the new values.
@@ -370,6 +372,94 @@ public partial class MainWindow : Window
}
}
+ private void WireOptionsNavigation()
+ {
+ var buttons = OptionsNavigationButtons();
+ for (var index = 0; index < buttons.Length; index++)
+ {
+ var section = index;
+ buttons[index].Click += (_, _) => SetOptionsSection(section);
+ buttons[index].PointerEntered += (_, _) => SetOptionsNavigationIndicator(section);
+ buttons[index].GotFocus += (_, _) => SetOptionsNavigationIndicator(section);
+ }
+
+ OptionsNavHost.PointerExited += (_, _) =>
+ SetOptionsNavigationIndicator(_optionsSectionIndex);
+ SetOptionsSection(0);
+ }
+
+ private Button[] OptionsNavigationButtons() =>
+ [
+ OptionsGeneralNav,
+ OptionsLoggingNav,
+ OptionsLauncherNav,
+ OptionsRenderingNav,
+ OptionsEnvironmentNav,
+ OptionsAboutNav,
+ ];
+
+ private Control[] OptionsSectionPanels() =>
+ [
+ OptionsGeneralPanel,
+ OptionsLoggingPanel,
+ OptionsLauncherPanel,
+ OptionsRenderingPanel,
+ OptionsEnvironmentPanel,
+ OptionsAboutPanel,
+ ];
+
+ private void SetOptionsSection(int section)
+ {
+ var buttons = OptionsNavigationButtons();
+ var panels = OptionsSectionPanels();
+ section = Math.Clamp(section, 0, buttons.Length - 1);
+ _optionsSectionIndex = section;
+ SetOptionsNavigationIndicator(section);
+
+ for (var index = 0; index < buttons.Length; index++)
+ {
+ var active = index == section;
+ SetActiveClass(buttons[index], active);
+ SetOptionsPanelInteraction(panels[index], active);
+ }
+ }
+
+ private static void SetOptionsPanelInteraction(Control panel, bool active)
+ {
+ if (active)
+ {
+ if (!panel.Classes.Contains("active"))
+ {
+ panel.Classes.Add("active");
+ }
+ }
+ else
+ {
+ panel.Classes.Remove("active");
+ }
+
+ panel.IsHitTestVisible = active;
+ AutomationProperties.SetAccessibilityView(
+ panel,
+ active ? AccessibilityView.Content : AccessibilityView.Raw);
+ KeyboardNavigation.SetTabNavigation(
+ panel,
+ active ? KeyboardNavigationMode.Continue : KeyboardNavigationMode.None);
+ }
+
+ private void SetOptionsNavigationIndicator(int section)
+ {
+ if (OptionsNavIndicator.RenderTransform is not TranslateTransform transform)
+ {
+ return;
+ }
+
+ var buttons = OptionsNavigationButtons();
+ var button = buttons[Math.Clamp(section, 0, buttons.Length - 1)];
+ transform.Y = button.TranslatePoint(default, OptionsNavHost)?.Y
+ ?? section * button.Bounds.Height;
+ }
+
// ---- Github http client config ----
// This is for getting lash commit id
private static HttpClient CreateGithubHttpClient()
@@ -613,6 +703,7 @@ public partial class MainWindow : Window
///
private void ApplyLocalization()
{
+ RefreshOptionsNavigationLabels();
RefreshLocalizedChoices();
UpdateLogFilePathText();
RefreshHostRefreshRates(_settings.RefreshRate);
@@ -621,6 +712,53 @@ public partial class MainWindow : Window
UpdateRunButtons();
}
+ private void RefreshOptionsNavigationLabels()
+ {
+ var localization = Localization.Instance;
+ SetOptionsNavigationLabel(
+ OptionsGeneralNav,
+ OptionsGeneralNavLabel,
+ localization.Get("Options.General"));
+ SetOptionsNavigationLabel(
+ OptionsLoggingNav,
+ OptionsLoggingNavLabel,
+ localization.Get("Options.Section.Logging"));
+ SetOptionsNavigationLabel(
+ OptionsLauncherNav,
+ OptionsLauncherNavLabel,
+ localization.Get("Options.Section.Launcher"));
+ SetOptionsNavigationLabel(
+ OptionsRenderingNav,
+ OptionsRenderingNavLabel,
+ localization.Get("Options.Section.Rendering"));
+ SetOptionsNavigationLabel(
+ OptionsEnvironmentNav,
+ OptionsEnvironmentNavLabel,
+ localization.Get("Options.Env.Tab"));
+ SetOptionsNavigationLabel(
+ OptionsAboutNav,
+ OptionsAboutNavLabel,
+ localization.Get("Options.About"));
+ }
+
+ private static void SetOptionsNavigationLabel(Button button, TextBlock label, string value)
+ {
+ var navigationLabel = SectionNavigationLabel(value);
+ label.Text = navigationLabel;
+ AutomationProperties.SetName(button, navigationLabel);
+ }
+
+ private static string SectionNavigationLabel(string value)
+ {
+ if (string.IsNullOrEmpty(value) || value.Any(char.IsLower))
+ {
+ return value;
+ }
+
+ var lower = value.ToLowerInvariant();
+ return char.ToUpperInvariant(lower[0]) + lower[1..];
+ }
+
// ---- Discord Rich Presence ----
///
diff --git a/src/SharpEmu.GUI/SharpEmu.GUI.csproj b/src/SharpEmu.GUI/SharpEmu.GUI.csproj
index 16363611..9180fe40 100644
--- a/src/SharpEmu.GUI/SharpEmu.GUI.csproj
+++ b/src/SharpEmu.GUI/SharpEmu.GUI.csproj
@@ -36,6 +36,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
+
@@ -44,6 +45,14 @@ SPDX-License-Identifier: GPL-2.0-or-later
+
+
+
+
Languages.%(Filename)%(Extension)
diff --git a/src/SharpEmu.GUI/Themes/Styles/Base.axaml b/src/SharpEmu.GUI/Themes/Styles/Base.axaml
index 9fdf22b8..728bab3a 100644
--- a/src/SharpEmu.GUI/Themes/Styles/Base.axaml
+++ b/src/SharpEmu.GUI/Themes/Styles/Base.axaml
@@ -11,6 +11,21 @@ Window and text defaults shared by all launcher views.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/SharpEmu.GUI/Themes/Templates/OptionsControls.axaml b/src/SharpEmu.GUI/Themes/Templates/OptionsControls.axaml
new file mode 100644
index 00000000..2b10b35f
--- /dev/null
+++ b/src/SharpEmu.GUI/Themes/Templates/OptionsControls.axaml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/SharpEmu.GUI/Themes/Templates/SettingRow.axaml b/src/SharpEmu.GUI/Themes/Templates/SettingRow.axaml
index cbeb09b3..7b37ae87 100644
--- a/src/SharpEmu.GUI/Themes/Templates/SettingRow.axaml
+++ b/src/SharpEmu.GUI/Themes/Templates/SettingRow.axaml
@@ -8,26 +8,51 @@ Control theme for the shared launcher settings row.
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:SharpEmu.GUI">
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/SharpEmu.GUI/Themes/Templates/SplitNumericUpDown.axaml b/src/SharpEmu.GUI/Themes/Templates/SplitNumericUpDown.axaml
new file mode 100644
index 00000000..5ad79d71
--- /dev/null
+++ b/src/SharpEmu.GUI/Themes/Templates/SplitNumericUpDown.axaml
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/SharpEmu.GUI/Themes/Tokens.axaml b/src/SharpEmu.GUI/Themes/Tokens.axaml
index 2a7c9bce..3f9e228a 100644
--- a/src/SharpEmu.GUI/Themes/Tokens.axaml
+++ b/src/SharpEmu.GUI/Themes/Tokens.axaml
@@ -6,6 +6,8 @@ Shared colors and brushes used throughout the launcher.
+ avares://SharpEmu.GUI/Assets/Fonts/MaterialSymbolsRounded-400.ttf#Material Symbols Rounded
+
#7C5CFC
diff --git a/tests/SharpEmu.Libs.Tests/GUI/GuiSettingsTests.cs b/tests/SharpEmu.Libs.Tests/GUI/GuiSettingsTests.cs
index ebfb7d11..e06abb09 100644
--- a/tests/SharpEmu.Libs.Tests/GUI/GuiSettingsTests.cs
+++ b/tests/SharpEmu.Libs.Tests/GUI/GuiSettingsTests.cs
@@ -95,6 +95,67 @@ public sealed class GuiSettingsTests
Assert.Equal(["SHARPEMU_TRACE"], settings.EnvironmentToggles);
}
+ [Fact]
+ public void NormalizeFromJson_AllLauncherOptions_ArePreserved()
+ {
+ const string json = """
+ {
+ "LogLevel": "Debug",
+ "ImportTraceLimit": 96,
+ "StrictDynlibResolution": true,
+ "LogToFile": true,
+ "LogFilePath": "C:\\Logs\\sharpemu.log",
+ "OverrideLogFile": true,
+ "PlayTitleMusic": false,
+ "EmulatorPath": "C:\\SharpEmu\\SharpEmu.exe",
+ "Language": "ru",
+ "DefaultProfile": "Player",
+ "DiscordRichPresence": false,
+ "CheckForUpdatesOnStartup": false,
+ "WindowMode": "Borderless",
+ "Resolution": "2560x1440",
+ "DisplayIndex": 2,
+ "RefreshRate": 144,
+ "ScalingMode": "Integer",
+ "VSync": false,
+ "HdrMode": "On",
+ "EnvironmentToggles": [
+ "SHARPEMU_VK_VALIDATION",
+ "SHARPEMU_GUEST_IMAGE_CPU_SYNC"
+ ],
+ "RenderResolutionScale": 0.5,
+ "DiscordClientId": "999"
+ }
+ """;
+
+ var settings = GuiSettings.NormalizeFromJson(json);
+
+ Assert.Equal("Debug", settings.LogLevel);
+ Assert.Equal(96, settings.ImportTraceLimit);
+ Assert.True(settings.StrictDynlibResolution);
+ Assert.True(settings.LogToFile);
+ Assert.Equal("C:\\Logs\\sharpemu.log", settings.LogFilePath);
+ Assert.True(settings.OverrideLogFile);
+ Assert.False(settings.PlayTitleMusic);
+ Assert.Equal("C:\\SharpEmu\\SharpEmu.exe", settings.EmulatorPath);
+ Assert.Equal("ru", settings.Language);
+ Assert.Equal("Player", settings.DefaultProfile);
+ Assert.False(settings.DiscordRichPresence);
+ Assert.False(settings.CheckForUpdatesOnStartup);
+ Assert.Equal("Borderless", settings.WindowMode);
+ Assert.Equal("2560x1440", settings.Resolution);
+ Assert.Equal(2, settings.DisplayIndex);
+ Assert.Equal(144, settings.RefreshRate);
+ Assert.Equal("Integer", settings.ScalingMode);
+ Assert.False(settings.VSync);
+ Assert.Equal("On", settings.HdrMode);
+ Assert.Equal(
+ ["SHARPEMU_VK_VALIDATION", "SHARPEMU_GUEST_IMAGE_CPU_SYNC"],
+ settings.EnvironmentToggles);
+ Assert.Equal(0.5, settings.RenderResolutionScale);
+ Assert.Equal("999", settings.DiscordClientId);
+ }
+
// An empty Discord client ID intentionally disables Rich Presence.
[Fact]
public void NormalizeFromJson_EmptyDiscordClientId_IsPreservedNotNormalized()