[GUI] Redesign options page (#699)

This commit is contained in:
Daniel Freak
2026-07-30 12:58:22 +03:00
committed by GitHub
parent 77f22973cb
commit f08308daf2
15 changed files with 1292 additions and 241 deletions
+3
View File
@@ -15,6 +15,8 @@ cascade order so individual launcher views do not redefine global visuals.
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="avares://SharpEmu.GUI/Themes/Tokens.axaml" />
<ResourceInclude Source="avares://SharpEmu.GUI/Themes/Templates/SettingRow.axaml" />
<ResourceInclude Source="avares://SharpEmu.GUI/Themes/Templates/OptionsControls.axaml" />
<ResourceInclude Source="avares://SharpEmu.GUI/Themes/Templates/SplitNumericUpDown.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
@@ -29,5 +31,6 @@ cascade order so individual launcher views do not redefine global visuals.
<StyleInclude Source="avares://SharpEmu.GUI/Themes/Styles/Inputs.axaml" />
<StyleInclude Source="avares://SharpEmu.GUI/Themes/Styles/Console.axaml" />
<StyleInclude Source="avares://SharpEmu.GUI/Themes/Styles/Library.axaml" />
<StyleInclude Source="avares://SharpEmu.GUI/Themes/Styles/Options.axaml" />
</Application.Styles>
</Application>
@@ -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;
/// <summary>
/// Numeric input whose native spinner is presented as a separate split button
/// </summary>
public sealed class SplitNumericUpDown : NumericUpDown;
+300 -223
View File
@@ -6,6 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
<Window xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:SharpEmu.GUI"
xmlns:settingsControls="using:SharpEmu.GUI.Controls.Settings"
x:Class="SharpEmu.GUI.MainWindow"
Title="SharpEmu"
Width="1280" Height="820"
@@ -323,102 +324,209 @@ SPDX-License-Identifier: GPL-2.0-or-later
</StackPanel>
</Grid>
<!-- Options page: sub-tabs so future categories (Graphics, …) slot
in next to General. Card-grouped sections match the visual
language used by the console panel below. -->
<Grid x:Name="OptionsPage" IsVisible="False">
<TabControl>
<TabItem x:Name="GeneralTabItem"
Header="{Binding [Options.General], Source={x:Static local:Localization.Instance}}"
FontSize="15">
<ScrollViewer>
<StackPanel Margin="0,14,0,16" Spacing="16" MaxWidth="1280" HorizontalAlignment="Left">
<!-- Options page: stable local navigation keeps each settings group
focused while preserving every setting from the current launcher -->
<Grid x:Name="OptionsPage"
IsVisible="False"
ColumnDefinitions="244,*"
ColumnSpacing="42"
Margin="32,14,32,16">
<Border Grid.Column="0" Classes="optionsNavSurface">
<ScrollViewer HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Hidden">
<Grid x:Name="OptionsNavHost">
<Border x:Name="OptionsNavIndicator"
Classes="optionsNavIndicator"
Height="54"
VerticalAlignment="Top"
IsHitTestVisible="False">
<Border.RenderTransform>
<TranslateTransform>
<TranslateTransform.Transitions>
<Transitions>
<DoubleTransition Property="Y"
Duration="0:0:0.16"
Easing="CubicEaseOut" />
</Transitions>
</TranslateTransform.Transitions>
</TranslateTransform>
</Border.RenderTransform>
</Border>
<Border Classes="card">
<StackPanel Spacing="14">
<TextBlock x:Name="EmulationSectionTitle" Classes="sectionTitle"
Text="{Binding [Options.Section.Emulation], Source={x:Static local:Localization.Instance}}" />
<StackPanel>
<Button x:Name="OptionsGeneralNav" Classes="optionsNav active">
<Grid ColumnDefinitions="36,*">
<TextBlock Grid.Column="0"
Classes="materialSymbol optionsNavIcon"
Text="tune" />
<TextBlock x:Name="OptionsGeneralNavLabel"
Grid.Column="1"
Classes="optionsNavLabel"
Text="General" />
</Grid>
</Button>
<Button x:Name="OptionsLoggingNav" Classes="optionsNav">
<Grid ColumnDefinitions="36,*">
<TextBlock Grid.Column="0"
Classes="materialSymbol optionsNavIcon"
Text="terminal" />
<TextBlock x:Name="OptionsLoggingNavLabel"
Grid.Column="1"
Classes="optionsNavLabel"
Text="Logging" />
</Grid>
</Button>
<Button x:Name="OptionsLauncherNav" Classes="optionsNav">
<Grid ColumnDefinitions="36,*">
<TextBlock Grid.Column="0"
Classes="materialSymbol optionsNavIcon"
Text="rocket_launch" />
<TextBlock x:Name="OptionsLauncherNavLabel"
Grid.Column="1"
Classes="optionsNavLabel"
Text="Launcher" />
</Grid>
</Button>
<Button x:Name="OptionsRenderingNav" Classes="optionsNav">
<Grid ColumnDefinitions="36,*">
<TextBlock Grid.Column="0"
Classes="materialSymbol optionsNavIcon"
Text="monitor" />
<TextBlock x:Name="OptionsRenderingNavLabel"
Grid.Column="1"
Classes="optionsNavLabel"
Text="Rendering" />
</Grid>
</Button>
<Button x:Name="OptionsEnvironmentNav" Classes="optionsNav">
<Grid ColumnDefinitions="36,*">
<TextBlock Grid.Column="0"
Classes="materialSymbol optionsNavIcon"
Text="deployed_code" />
<TextBlock x:Name="OptionsEnvironmentNavLabel"
Grid.Column="1"
Classes="optionsNavLabel"
Text="Environment" />
</Grid>
</Button>
<Button x:Name="OptionsAboutNav" Classes="optionsNav">
<Grid ColumnDefinitions="36,*">
<TextBlock Grid.Column="0"
Classes="materialSymbol optionsNavIcon"
Text="info" />
<TextBlock x:Name="OptionsAboutNavLabel"
Grid.Column="1"
Classes="optionsNavLabel"
Text="About" />
</Grid>
</Button>
</StackPanel>
</Grid>
</ScrollViewer>
</Border>
<Border Grid.Column="1" Classes="optionsContentSurface">
<Panel>
<ScrollViewer x:Name="OptionsGeneralPanel"
Classes="optionsSectionPanel active">
<StackPanel>
<Border Classes="optionsGroup">
<StackPanel Spacing="8">
<local:SettingRow x:Name="CpuEngineRow"
Classes="optionRow"
Label="{Binding [Options.CpuEngine.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.CpuEngine.Desc], Source={x:Static local:Localization.Instance}}">
<ComboBox x:Name="CpuEngineBox" Width="160"
<ComboBox x:Name="CpuEngineBox"
Classes="optionValue"
ItemTemplate="{StaticResource LocalizedChoiceTemplate}"
HorizontalContentAlignment="Left"
VerticalAlignment="Center" CornerRadius="8" />
VerticalAlignment="Center" />
</local:SettingRow>
<local:SettingRow x:Name="StrictRow"
Classes="optionRow"
Label="{Binding [Options.Strict.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.Strict.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="StrictToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
Classes="optionToggle" />
</local:SettingRow>
</StackPanel>
</Border>
</StackPanel>
</ScrollViewer>
<Border Classes="card">
<StackPanel Spacing="14">
<TextBlock x:Name="LoggingSectionTitle" Classes="sectionTitle"
Text="{Binding [Options.Section.Logging], Source={x:Static local:Localization.Instance}}" />
<ScrollViewer x:Name="OptionsLoggingPanel"
Classes="optionsSectionPanel">
<StackPanel>
<Border Classes="optionsGroup">
<StackPanel Spacing="8">
<local:SettingRow x:Name="LogLevelRow"
Classes="optionRow"
Label="{Binding [Options.LogLevel.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.LogLevel.Desc], Source={x:Static local:Localization.Instance}}">
<ComboBox x:Name="LogLevelBox" Width="160"
<ComboBox x:Name="LogLevelBox"
Classes="optionValue"
ItemTemplate="{StaticResource LocalizedChoiceTemplate}"
HorizontalContentAlignment="Left"
VerticalAlignment="Center" CornerRadius="8" />
VerticalAlignment="Center" />
</local:SettingRow>
<local:SettingRow x:Name="TraceImportsRow"
Classes="optionRow"
Label="{Binding [Options.TraceImports.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.TraceImports.Desc], Source={x:Static local:Localization.Instance}}">
<NumericUpDown x:Name="TraceImportsBox" Width="160" Minimum="0"
Maximum="4096" Increment="16" Value="0" FormatString="0"
VerticalAlignment="Center" CornerRadius="8" />
<settingsControls:SplitNumericUpDown x:Name="TraceImportsBox"
Classes="optionValue"
Minimum="0"
Maximum="4096" Increment="16" Value="0" FormatString="0"
VerticalAlignment="Center" />
</local:SettingRow>
<local:SettingRow x:Name="LogToFileRow"
Classes="optionRow"
Label="{Binding [Options.LogToFile.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.LogToFile.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="LogToFileToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
Classes="optionToggle" />
</local:SettingRow>
<local:SettingRow x:Name="LogFilePathRow"
Classes="optionRow"
Label="{Binding [Options.LogFilePath.Label], Source={x:Static local:Localization.Instance}}"
Description="No custom path">
<Button x:Name="SelectLogFilePathButton" Classes="ghost"
Content="{Binding [Options.LogFilePath.Select], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
<Button x:Name="SelectLogFilePathButton"
Classes="optionAction">
<TextBlock x:Name="SelectLogFilePathButtonLabel"
Text="{Binding [Options.LogFilePath.Select], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
</Button>
</local:SettingRow>
<local:SettingRow x:Name="OverrideLogFileRow"
Classes="optionRow"
Label="{Binding [Options.OverrideLogFile.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.OverrideLogFile.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="OverrideLogFileToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
Classes="optionToggle" />
</local:SettingRow>
</StackPanel>
</Border>
</StackPanel>
</ScrollViewer>
<Border Classes="card">
<StackPanel Spacing="14">
<TextBlock x:Name="LauncherSectionTitle" Classes="sectionTitle"
Text="{Binding [Options.Section.Launcher], Source={x:Static local:Localization.Instance}}" />
<ScrollViewer x:Name="OptionsLauncherPanel"
Classes="optionsSectionPanel">
<StackPanel>
<Border Classes="optionsGroup">
<StackPanel Spacing="8">
<local:SettingRow x:Name="LanguageRow"
Classes="optionRow"
Label="{Binding [Options.Language.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.Language.Desc], Source={x:Static local:Localization.Instance}}">
<ComboBox x:Name="LanguageBox" Width="160"
VerticalAlignment="Center" CornerRadius="8">
<ComboBox x:Name="LanguageBox"
Classes="optionValue"
Width="210"
VerticalAlignment="Center">
<ComboBox.ItemTemplate>
<DataTemplate x:DataType="local:LanguageInfo">
<TextBlock Text="{Binding NativeName}" />
@@ -428,313 +536,282 @@ SPDX-License-Identifier: GPL-2.0-or-later
</local:SettingRow>
<local:SettingRow x:Name="DefaultProfileRow"
Classes="optionRow"
Label="{Binding [Options.DefaultProfile.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.DefaultProfile.Desc], Source={x:Static local:Localization.Instance}}">
<TextBox x:Name="DefaultProfileBox"
Width="180"
Classes="optionValue"
MaxLength="16"
VerticalAlignment="Center" />
</local:SettingRow>
<local:SettingRow x:Name="TitleMusicRow"
Classes="optionRow"
Label="{Binding [Options.TitleMusic.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.TitleMusic.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="TitleMusicToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
IsChecked="True" VerticalAlignment="Center" />
Classes="optionToggle"
IsChecked="True" />
</local:SettingRow>
<local:SettingRow x:Name="DiscordRow"
Classes="optionRow"
Label="{Binding [Options.Discord.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.Discord.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="DiscordToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
Classes="optionToggle" />
</local:SettingRow>
<local:SettingRow x:Name="AutoUpdateRow"
Classes="optionRow"
Label="{Binding [Updater.Auto.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Updater.Auto.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="AutoUpdateToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
IsChecked="True" VerticalAlignment="Center" />
Classes="optionToggle"
IsChecked="True" />
</local:SettingRow>
</StackPanel>
</Border>
<Border Classes="card">
<StackPanel Spacing="14">
<TextBlock x:Name="AboutSectionTitle"
Classes="sectionTitle"
Text="{Binding [Options.About], Source={x:Static local:Localization.Instance}}" />
</StackPanel>
</ScrollViewer>
<ScrollViewer x:Name="OptionsAboutPanel"
Classes="optionsSectionPanel">
<StackPanel>
<Border Classes="optionsGroup">
<StackPanel Spacing="8">
<!--Latest commit info-->
<Grid ColumnDefinitions="*,Auto">
<StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
<Image Source="avares://SharpEmu.GUI/Assets/commit-icon.png"
Width="24" Height="24" VerticalAlignment="Center" />
<StackPanel Spacing="2" VerticalAlignment="Center">
<Border Classes="optionsInfoRow">
<Grid ColumnDefinitions="*,Auto" ColumnSpacing="18">
<StackPanel VerticalAlignment="Center">
<TextBlock x:Name="LatestCommitLabel"
Text="{Binding [About.Github.LatestCommitLabel], Source={x:Static local:Localization.Instance}}"
FontSize="13"/>
FontSize="14"
FontWeight="Medium" />
<TextBlock x:Name="LatestCommitDescription"
Text="{Binding [About.Github.LatestCommitDescription], Source={x:Static local:Localization.Instance}}"
FontSize="11" Foreground="{StaticResource MutedBrush}"/>
FontSize="11"
Foreground="{StaticResource MutedBrush}"
TextWrapping="Wrap" />
</StackPanel>
</StackPanel>
<Button Grid.Column="1" x:Name="LatestCommitHashText" Classes="ghost"
Content="Loading…" FontSize="12" FontFamily="Consolas,monospace"
VerticalAlignment="Center" IsEnabled="False" />
</Grid>
<Button Grid.Column="1"
x:Name="LatestCommitHashText"
Classes="optionAction"
Content="Loading…"
FontSize="12"
FontFamily="Consolas,monospace"
VerticalAlignment="Center"
IsEnabled="False" />
</Grid>
</Border>
<!--Update-->
<Grid ColumnDefinitions="*,Auto">
<StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
<Image Source="avares://SharpEmu.GUI/Assets/update-icon.png"
Width="24"
Height="24"
VerticalAlignment="Center" />
<StackPanel Spacing="2" VerticalAlignment="Center">
<Border Classes="optionsInfoRow">
<Grid ColumnDefinitions="*,Auto" ColumnSpacing="18">
<StackPanel VerticalAlignment="Center">
<TextBlock x:Name="UpdateLabel"
Text="{Binding [Updater.Label], Source={x:Static local:Localization.Instance}}"
FontSize="13" />
<TextBlock x:Name="UpdateStatusText" Text="Current build: dev" FontSize="11"
Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap" />
FontSize="14"
FontWeight="Medium" />
<TextBlock x:Name="UpdateStatusText"
Text="Current build: dev"
FontSize="11"
Foreground="{StaticResource MutedBrush}"
TextWrapping="Wrap" />
</StackPanel>
</StackPanel>
<Button Grid.Column="1" x:Name="UpdateButton" Classes="ghost"
Content="Check for updates" VerticalAlignment="Center" />
</Grid>
<Button Grid.Column="1"
x:Name="UpdateButton"
Classes="optionAction"
Content="Check for updates"
VerticalAlignment="Center" />
</Grid>
</Border>
<!--Github-->
<Grid ColumnDefinitions="*,Auto">
<StackPanel Grid.Column="0"
Orientation="Horizontal"
Spacing="8"
VerticalAlignment="Center">
<Image Source="avares://SharpEmu.GUI/Assets/github.png"
Width="20"
Height="20"
VerticalAlignment="Center" />
<StackPanel VerticalAlignment="Center"
Spacing="2">
<Border Classes="optionsInfoRow">
<Grid ColumnDefinitions="*,Auto" ColumnSpacing="18">
<StackPanel VerticalAlignment="Center">
<TextBlock x:Name="GithubLabel"
Text="{Binding [About.Github.Label], Source={x:Static local:Localization.Instance}}"
FontSize="13" />
Text="{Binding [About.Github.Label], Source={x:Static local:Localization.Instance}}"
FontSize="14"
FontWeight="Medium" />
<TextBlock x:Name="GithubDesc"
Text="{Binding [About.Github.Desc], Source={x:Static local:Localization.Instance}}"
FontSize="11"
Foreground="{StaticResource MutedBrush}"
TextWrapping="Wrap" />
Text="{Binding [About.Github.Desc], Source={x:Static local:Localization.Instance}}"
FontSize="11"
Foreground="{StaticResource MutedBrush}"
TextWrapping="Wrap" />
</StackPanel>
</StackPanel>
<Button Grid.Column="1"
x:Name="GithubButton"
Classes="ghost"
Content="{Binding [About.GithubButton], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
</Grid>
<Button Grid.Column="1"
x:Name="GithubButton"
Classes="optionAction"
Content="{Binding [About.GithubButton], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
</Grid>
</Border>
<!--Discord-->
<Grid ColumnDefinitions="*,Auto">
<StackPanel Grid.Column="0"
Orientation="Horizontal"
Spacing="8"
VerticalAlignment="Center">
<Image Source="avares://SharpEmu.GUI/Assets/discord.png"
Width="20"
Height="20"
VerticalAlignment="Center" />
<StackPanel VerticalAlignment="Center"
Spacing="2">
<Border Classes="optionsInfoRow">
<Grid ColumnDefinitions="*,Auto" ColumnSpacing="18">
<StackPanel VerticalAlignment="Center">
<TextBlock x:Name="DiscordServerLabel"
Text="{Binding [About.Discord.Label], Source={x:Static local:Localization.Instance}}"
FontSize="13" />
FontSize="14"
FontWeight="Medium" />
<TextBlock x:Name="DiscordServerDesc"
Text="{Binding [About.Discord.Desc], Source={x:Static local:Localization.Instance}}"
FontSize="11"
Foreground="{StaticResource MutedBrush}"
TextWrapping="Wrap" />
</StackPanel>
</StackPanel>
<TextBlock Grid.Column="1"
x:Name="DiscordComingSoonText"
Text="{Binding [About.DiscordComingSoon], Source={x:Static local:Localization.Instance}}"
FontSize="12"
Foreground="{StaticResource MutedBrush}"
VerticalAlignment="Center" />
</Grid>
<TextBlock Grid.Column="1"
x:Name="DiscordComingSoonText"
Text="{Binding [About.DiscordComingSoon], Source={x:Static local:Localization.Instance}}"
FontSize="12"
Foreground="{StaticResource MutedBrush}"
VerticalAlignment="Center" />
</Grid>
</Border>
</StackPanel>
</Border>
</StackPanel>
</ScrollViewer>
</TabItem>
<TabItem x:Name="GraphicsTabItem"
Header="{Binding [Options.Graphics], Source={x:Static local:Localization.Instance}}"
FontSize="15">
<ScrollViewer>
<StackPanel Margin="0,14,0,16" Spacing="16" MaxWidth="1280" HorizontalAlignment="Left">
<Border Classes="card">
<StackPanel Spacing="14">
<TextBlock x:Name="RenderingSectionTitle" Classes="sectionTitle"
Text="{Binding [Options.Section.Rendering], Source={x:Static local:Localization.Instance}}" />
<ScrollViewer x:Name="OptionsRenderingPanel"
Classes="optionsSectionPanel">
<StackPanel Spacing="16">
<Border Classes="optionsGroup">
<StackPanel Spacing="8">
<local:SettingRow x:Name="RenderResolutionRow"
Classes="optionRow"
Label="{Binding [Options.RenderResolution.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.RenderResolution.Desc], Source={x:Static local:Localization.Instance}}">
<ComboBox x:Name="RenderResolutionBox" Width="160"
<ComboBox x:Name="RenderResolutionBox"
Classes="optionValue"
ItemTemplate="{StaticResource LocalizedChoiceTemplate}"
HorizontalContentAlignment="Left"
VerticalAlignment="Center" CornerRadius="8" />
VerticalAlignment="Center" />
</local:SettingRow>
</StackPanel>
</Border>
<Border Classes="card">
<StackPanel Spacing="14">
<TextBlock x:Name="DisplaySectionTitle" Classes="sectionTitle"
Text="{Binding [Options.Section.Display], Source={x:Static local:Localization.Instance}}" />
<Border Classes="optionsGroup">
<StackPanel Spacing="8">
<local:SettingRow x:Name="WindowModeRow"
Classes="optionRow"
Label="{Binding [Options.WindowMode.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.WindowMode.Desc], Source={x:Static local:Localization.Instance}}">
<ComboBox x:Name="WindowModeBox" Width="180"
<ComboBox x:Name="WindowModeBox"
Classes="optionValue"
ItemTemplate="{StaticResource LocalizedChoiceTemplate}"
HorizontalContentAlignment="Left"
CornerRadius="8" />
VerticalAlignment="Center" />
</local:SettingRow>
<local:SettingRow x:Name="ResolutionRow"
Classes="optionRow"
Label="{Binding [Options.Resolution.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.Resolution.Desc], Source={x:Static local:Localization.Instance}}">
<ComboBox x:Name="ResolutionBox" Width="180" CornerRadius="8" />
<ComboBox x:Name="ResolutionBox"
Classes="optionValue"
VerticalAlignment="Center" />
</local:SettingRow>
<local:SettingRow x:Name="DisplayRow"
Classes="optionRow"
Label="{Binding [Options.Display.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.Display.Desc], Source={x:Static local:Localization.Instance}}">
<ComboBox x:Name="DisplayBox" Width="260" CornerRadius="8" />
<ComboBox x:Name="DisplayBox"
Classes="optionValue"
Width="260"
VerticalAlignment="Center" />
</local:SettingRow>
<local:SettingRow x:Name="RefreshRateRow"
Classes="optionRow"
Label="{Binding [Options.RefreshRate.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.RefreshRate.Desc], Source={x:Static local:Localization.Instance}}">
<ComboBox x:Name="RefreshRateBox" Width="180" CornerRadius="8" />
<ComboBox x:Name="RefreshRateBox"
Classes="optionValue"
VerticalAlignment="Center" />
</local:SettingRow>
<local:SettingRow x:Name="ScalingRow"
Classes="optionRow"
Label="{Binding [Options.Scaling.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.Scaling.Desc], Source={x:Static local:Localization.Instance}}">
<ComboBox x:Name="ScalingModeBox" Width="180"
<ComboBox x:Name="ScalingModeBox"
Classes="optionValue"
ItemTemplate="{StaticResource LocalizedChoiceTemplate}"
HorizontalContentAlignment="Left"
CornerRadius="8" />
VerticalAlignment="Center" />
</local:SettingRow>
<local:SettingRow x:Name="VSyncRow"
Classes="optionRow"
Label="{Binding [Options.VSync.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.VSync.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="VSyncToggle" IsChecked="True"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}" />
<ToggleSwitch x:Name="VSyncToggle"
Classes="optionToggle"
IsChecked="True" />
</local:SettingRow>
<local:SettingRow x:Name="HdrRow"
Classes="optionRow"
Label="{Binding [Options.Hdr.Label], Source={x:Static local:Localization.Instance}}"
Description="{Binding [Options.Hdr.Desc], Source={x:Static local:Localization.Instance}}">
<ComboBox x:Name="HdrModeBox" Width="180"
<ComboBox x:Name="HdrModeBox"
Classes="optionValue"
ItemTemplate="{StaticResource LocalizedChoiceTemplate}"
HorizontalContentAlignment="Left"
CornerRadius="8" />
VerticalAlignment="Center" />
</local:SettingRow>
</StackPanel>
</Border>
</StackPanel>
</ScrollViewer>
</TabItem>
<TabItem x:Name="EnvTabItem"
Header="{Binding [Options.Env.Tab], Source={x:Static local:Localization.Instance}}"
FontSize="15">
<ScrollViewer>
<StackPanel Margin="0,14,0,16" Spacing="16" MaxWidth="1280" HorizontalAlignment="Left">
<Border Classes="card">
<StackPanel Spacing="14">
<TextBlock x:Name="EnvSectionTitle" Classes="sectionTitle"
Text="{Binding [Options.Section.Environment], Source={x:Static local:Localization.Instance}}" />
<TextBlock x:Name="EnvDesc"
Text="{Binding [Options.Env.Desc], Source={x:Static local:Localization.Instance}}"
FontSize="11" Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap" />
<local:SettingRow x:Name="EnvBthidRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_BTHID_UNAVAILABLE"
<ScrollViewer x:Name="OptionsEnvironmentPanel"
Classes="optionsSectionPanel">
<StackPanel>
<Border Classes="optionsGroup">
<StackPanel Spacing="8">
<local:SettingRow x:Name="EnvBthidRow" Classes="optionRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_BTHID_UNAVAILABLE"
Description="{Binding [Options.Env.Bthid.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="EnvBthidToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
<ToggleSwitch x:Name="EnvBthidToggle" Classes="optionToggle" />
</local:SettingRow>
<local:SettingRow x:Name="EnvLoopGuardRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_DISABLE_IMPORT_LOOP_GUARD"
<local:SettingRow x:Name="EnvLoopGuardRow" Classes="optionRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_DISABLE_IMPORT_LOOP_GUARD"
Description="{Binding [Options.Env.LoopGuard.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="EnvLoopGuardToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
<ToggleSwitch x:Name="EnvLoopGuardToggle" Classes="optionToggle" />
</local:SettingRow>
<local:SettingRow x:Name="EnvWritableApp0Row" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_WRITABLE_APP0"
<local:SettingRow x:Name="EnvWritableApp0Row" Classes="optionRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_WRITABLE_APP0"
Description="{Binding [Options.Env.WritableApp0.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="EnvWritableApp0Toggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
<ToggleSwitch x:Name="EnvWritableApp0Toggle" Classes="optionToggle" />
</local:SettingRow>
<local:SettingRow x:Name="EnvVkValidationRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_VK_VALIDATION"
<local:SettingRow x:Name="EnvVkValidationRow" Classes="optionRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_VK_VALIDATION"
Description="{Binding [Options.Env.VkValidation.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="EnvVkValidationToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
<ToggleSwitch x:Name="EnvVkValidationToggle" Classes="optionToggle" />
</local:SettingRow>
<local:SettingRow x:Name="EnvDumpSpirvRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_DUMP_SPIRV"
<local:SettingRow x:Name="EnvDumpSpirvRow" Classes="optionRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_DUMP_SPIRV"
Description="{Binding [Options.Env.DumpSpirv.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="EnvDumpSpirvToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
<ToggleSwitch x:Name="EnvDumpSpirvToggle" Classes="optionToggle" />
</local:SettingRow>
<local:SettingRow x:Name="EnvLogDirectMemoryRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_LOG_DIRECT_MEMORY"
<local:SettingRow x:Name="EnvLogDirectMemoryRow" Classes="optionRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_LOG_DIRECT_MEMORY"
Description="{Binding [Options.Env.LogDirectMemory.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="EnvLogDirectMemoryToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
<ToggleSwitch x:Name="EnvLogDirectMemoryToggle" Classes="optionToggle" />
</local:SettingRow>
<local:SettingRow x:Name="EnvLogIoRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_LOG_IO"
<local:SettingRow x:Name="EnvLogIoRow" Classes="optionRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_LOG_IO"
Description="{Binding [Options.Env.LogIo.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="EnvLogIoToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
<ToggleSwitch x:Name="EnvLogIoToggle" Classes="optionToggle" />
</local:SettingRow>
<local:SettingRow x:Name="EnvLogNpRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_LOG_NP"
<local:SettingRow x:Name="EnvLogNpRow" Classes="optionRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_LOG_NP"
Description="{Binding [Options.Env.LogNp.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="EnvLogNpToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
<ToggleSwitch x:Name="EnvLogNpToggle" Classes="optionToggle" />
</local:SettingRow>
<local:SettingRow x:Name="EnvGuestImageCpuSyncRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_GUEST_IMAGE_CPU_SYNC"
<local:SettingRow x:Name="EnvGuestImageCpuSyncRow" Classes="optionRow" LabelFontFamily="Consolas,monospace" Label="SHARPEMU_GUEST_IMAGE_CPU_SYNC"
Description="{Binding [Options.Env.GuestImageCpuSync.Desc], Source={x:Static local:Localization.Instance}}">
<ToggleSwitch x:Name="EnvGuestImageCpuSyncToggle"
OnContent="{Binding [Common.On], Source={x:Static local:Localization.Instance}}"
OffContent="{Binding [Common.Off], Source={x:Static local:Localization.Instance}}"
VerticalAlignment="Center" />
<ToggleSwitch x:Name="EnvGuestImageCpuSyncToggle" Classes="optionToggle" />
</local:SettingRow>
</StackPanel>
@@ -742,8 +819,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
</StackPanel>
</ScrollViewer>
</TabItem>
</TabControl>
</Panel>
</Border>
</Grid>
</Panel>
+138
View File
@@ -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
/// </summary>
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 ----
/// <summary>
+9
View File
@@ -36,6 +36,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
</ItemGroup>
<ItemGroup>
<AvaloniaResource Include="Assets\Fonts\MaterialSymbolsRounded-400.ttf" />
<AvaloniaResource Include="..\..\assets\images\SharpEmu.ico" Link="Assets/SharpEmu.ico" />
<AvaloniaResource Include="..\..\assets\images\github.png" Link="Assets/github.png" />
<AvaloniaResource Include="..\..\assets\images\discord.png" Link="Assets/discord.png" />
@@ -44,6 +45,14 @@ SPDX-License-Identifier: GPL-2.0-or-later
<AvaloniaResource Include="..\..\assets\images\pic0.png" Link="Assets/pic0.png" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\LICENSES\Apache-2.0.txt"
Link="licenses\Apache-2.0.txt"
CopyToOutputDirectory="PreserveNewest"
CopyToPublishDirectory="PreserveNewest"
TargetPath="licenses\Apache-2.0.txt" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Languages\*.json">
<LogicalName>Languages.%(Filename)%(Extension)</LogicalName>
+15
View File
@@ -11,6 +11,21 @@ Window and text defaults shared by all launcher views.
<Setter Property="Foreground" Value="{StaticResource TextBrush}" />
</Style>
<Style Selector="TextBlock.materialSymbol">
<Setter Property="FontFamily" Value="{StaticResource MaterialSymbolsRounded}" />
<Setter Property="FontFeatures" Value="+liga" />
<Setter Property="FontSize" Value="18" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="LineHeight" Value="20" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="TextAlignment" Value="Center" />
</Style>
<Style Selector="TextBlock.materialSymbol.compact">
<Setter Property="FontSize" Value="16" />
<Setter Property="LineHeight" Value="18" />
</Style>
<Style Selector="TextBlock.sectionTitle">
<Setter Property="FontSize" Value="11" />
<Setter Property="FontWeight" Value="SemiBold" />
@@ -0,0 +1,229 @@
<!--
Copyright (C) 2026 SharpEmu Emulator Project
SPDX-License-Identifier: GPL-2.0-or-later
Options page navigation, section transitions and content layout
-->
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:SharpEmu.GUI"
xmlns:settingsControls="using:SharpEmu.GUI.Controls.Settings">
<Style Selector="Border.optionsNavSurface">
<Setter Property="Width" Value="244" />
<Setter Property="Padding" Value="0" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="VerticalAlignment" Value="Top" />
</Style>
<Style Selector="Border.optionsNavIndicator">
<Setter Property="Height" Value="54" />
<Setter Property="Margin" Value="0,3,0,0" />
<Setter Property="CornerRadius" Value="12" />
<Setter Property="Background" Value="#13FFFFFF" />
<Setter Property="BorderBrush" Value="#E6FFFFFF" />
<Setter Property="BorderThickness" Value="2" />
<Setter Property="BoxShadow" Value="0 8 24 0 #24000000" />
</Style>
<Style Selector="Button.optionsNav">
<Setter Property="Height" Value="61" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="Padding" Value="16,0" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="CornerRadius" Value="12" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Foreground" Value="#8FFFFFFF" />
<Setter Property="FontSize" Value="14" />
<Setter Property="FontWeight" Value="Medium" />
<Setter Property="FocusAdorner" Value="{x:Null}" />
<Setter Property="RenderTransform" Value="none" />
</Style>
<Style Selector="Button.optionsNav /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="Foreground" Value="#8FFFFFFF" />
</Style>
<Style Selector="Button.optionsNav:pointerover /template/ ContentPresenter#PART_ContentPresenter,
Button.optionsNav:focus-visible /template/ ContentPresenter#PART_ContentPresenter,
Button.optionsNav.active /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="Foreground" Value="White" />
</Style>
<Style Selector="Button.optionsNav:pressed">
<Setter Property="RenderTransform" Value="none" />
</Style>
<Style Selector="TextBlock.optionsNavIcon">
<Setter Property="Width" Value="20" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="Padding" Value="0,0,0,5" />
<Setter Property="Foreground" Value="#8FFFFFFF" />
<Setter Property="Transitions">
<Transitions>
<BrushTransition Property="Foreground"
Duration="0:0:0.18"
Easing="CubicEaseOut" />
</Transitions>
</Setter>
</Style>
<Style Selector="TextBlock.optionsNavLabel">
<Setter Property="FontSize" Value="14" />
<Setter Property="FontWeight" Value="Medium" />
<Setter Property="LineHeight" Value="20" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Padding" Value="0,0,0,4" />
<Setter Property="Foreground" Value="#8FFFFFFF" />
<Setter Property="Transitions">
<Transitions>
<BrushTransition Property="Foreground"
Duration="0:0:0.18"
Easing="CubicEaseOut" />
</Transitions>
</Setter>
</Style>
<Style Selector="Button.optionsNav:pointerover TextBlock.optionsNavIcon,
Button.optionsNav:focus-visible TextBlock.optionsNavIcon,
Button.optionsNav.active TextBlock.optionsNavIcon">
<Setter Property="Foreground" Value="White" />
</Style>
<Style Selector="Button.optionsNav:pointerover TextBlock.optionsNavLabel,
Button.optionsNav:focus-visible TextBlock.optionsNavLabel,
Button.optionsNav.active TextBlock.optionsNavLabel">
<Setter Property="Foreground" Value="White" />
</Style>
<Style Selector="Border.optionsContentSurface">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="ClipToBounds" Value="True" />
</Style>
<Style Selector="ScrollViewer.optionsSectionPanel">
<Setter Property="Opacity" Value="0" />
<Setter Property="RenderTransform" Value="translateY(22px)" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="HorizontalScrollBarVisibility" Value="Disabled" />
<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="Transitions">
<Transitions>
<DoubleTransition Property="Opacity"
Duration="0:0:0.18"
Easing="CubicEaseOut" />
<TransformOperationsTransition Property="RenderTransform"
Duration="0:0:0.28"
Easing="CubicEaseOut" />
</Transitions>
</Setter>
</Style>
<Style Selector="ScrollViewer.optionsSectionPanel.active">
<Setter Property="Opacity" Value="1" />
<Setter Property="RenderTransform" Value="translateY(0px)" />
</Style>
<Style Selector="Border.optionsGroup">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Padding" Value="0" />
</Style>
<Style Selector="Border.optionsInfoRow">
<Setter Property="MinHeight" Value="70" />
<Setter Property="Padding" Value="18,12" />
<Setter Property="CornerRadius" Value="14" />
<Setter Property="Background" Value="#06FFFFFF" />
<Setter Property="BorderBrush" Value="#0AFFFFFF" />
<Setter Property="BorderThickness" Value="1" />
</Style>
<Style Selector="local|SettingRow.optionRow:focus-within /template/ Border#PART_RowSurface">
<Setter Property="Background" Value="#0DFFFFFF" />
<Setter Property="BorderBrush" Value="#22FFFFFF" />
</Style>
<Style Selector="ComboBox.optionValue, settingsControls|SplitNumericUpDown.optionValue, TextBox.optionValue">
<Setter Property="Width" Value="190" />
<Setter Property="MinHeight" Value="44" />
<Setter Property="CornerRadius" Value="14" />
<Setter Property="Background" Value="#12FFFFFF" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
</Style>
<Style Selector="TextBox.optionValue">
<Setter Property="Padding" Value="17,0" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="TextAlignment" Value="Left" />
<Setter Property="ClipToBounds" Value="True" />
<Setter Property="FocusAdorner" Value="{x:Null}" />
</Style>
<Style Selector="TextBox.optionValue /template/ Border#PART_BorderElement">
<Setter Property="CornerRadius" Value="14" />
<Setter Property="ClipToBounds" Value="True" />
<Setter Property="Background" Value="#12FFFFFF" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
</Style>
<!-- The outer split-input surface owns hover and focus animation -->
<Style Selector="TextBox.splitNumericTextBox /template/ Border#PART_BorderElement,
TextBox.splitNumericTextBox:pointerover /template/ Border#PART_BorderElement,
TextBox.splitNumericTextBox:focus /template/ Border#PART_BorderElement">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
</Style>
<Style Selector="ToggleSwitch.optionToggle">
<Setter Property="Theme" Value="{StaticResource OptionToggleTheme}" />
<Setter Property="VerticalAlignment" Value="Center" />
</Style>
<Style Selector="Button.optionAction">
<Setter Property="MinWidth" Value="156" />
<Setter Property="MinHeight" Value="44" />
<Setter Property="Padding" Value="18,0" />
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="CornerRadius" Value="12" />
<Setter Property="Background" Value="#12FFFFFF" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontWeight" Value="Medium" />
<Setter Property="FocusAdorner" Value="{x:Null}" />
</Style>
<Style Selector="Button.optionAction /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="#12FFFFFF" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Transitions">
<Transitions>
<BrushTransition Property="Background"
Duration="0:0:0.18"
Easing="CubicEaseOut" />
</Transitions>
</Setter>
</Style>
<Style Selector="Button.optionAction:pointerover /template/ ContentPresenter#PART_ContentPresenter,
Button.optionAction:focus-visible /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="#20FFFFFF" />
<Setter Property="BorderBrush" Value="Transparent" />
</Style>
</Styles>
@@ -0,0 +1,76 @@
<!--
Copyright (C) 2026 SharpEmu Emulator Project
SPDX-License-Identifier: GPL-2.0-or-later
Options-only control resources: compact toggle theme
-->
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ControlTheme x:Key="OptionToggleTheme" TargetType="ToggleSwitch">
<Setter Property="Width" Value="46" />
<Setter Property="Height" Value="26" />
<Setter Property="MinWidth" Value="46" />
<Setter Property="MinHeight" Value="26" />
<Setter Property="Padding" Value="0" />
<Setter Property="Background" Value="#2BFFFFFF" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="FocusAdorner" Value="{x:Null}" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="KnobTransitions">
<Transitions>
<DoubleTransition Property="Canvas.Left"
Duration="0:0:0.18"
Easing="CubicEaseOut" />
</Transitions>
</Setter>
<Setter Property="Template">
<ControlTemplate>
<Border x:Name="PART_Track"
Width="{TemplateBinding Width}"
Height="{TemplateBinding Height}"
Padding="3"
Background="{TemplateBinding Background}"
BorderThickness="0"
CornerRadius="13"
ClipToBounds="True">
<Canvas x:Name="PART_SwitchKnob"
Width="20"
Height="20"
HorizontalAlignment="Left"
VerticalAlignment="Center">
<Grid x:Name="PART_MovingKnobs"
Width="20"
Height="20"
Canvas.Left="0">
<Border x:Name="PART_Thumb"
Background="{StaticResource TextBrush}"
BorderThickness="0"
CornerRadius="10" />
</Grid>
</Canvas>
<Border.Transitions>
<Transitions>
<BrushTransition Property="Background"
Duration="0:0:0.16"
Easing="CubicEaseOut" />
</Transitions>
</Border.Transitions>
</Border>
</ControlTemplate>
</Setter>
<Style Selector="^:pointerover /template/ Border#PART_Track">
<Setter Property="Background" Value="#38FFFFFF" />
</Style>
<Style Selector="^:checked /template/ Border#PART_Track">
<Setter Property="Background" Value="{StaticResource AccentBrush}" />
</Style>
<Style Selector="^:checked:pointerover /template/ Border#PART_Track">
<Setter Property="Background" Value="{StaticResource AccentHoverBrush}" />
</Style>
<Style Selector="^:disabled /template/ Border#PART_Track">
<Setter Property="Opacity" Value="0.45" />
</Style>
</ControlTheme>
</ResourceDictionary>
@@ -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">
<ControlTheme x:Key="{x:Type local:SettingRow}" TargetType="local:SettingRow">
<Setter Property="MinHeight" Value="70" />
<Setter Property="Template">
<ControlTemplate>
<Grid ColumnDefinitions="*,Auto">
<StackPanel VerticalAlignment="Center" Spacing="2" Margin="0,0,16,0">
<TextBlock x:Name="PART_Label" Text="{TemplateBinding Label}" FontSize="13" />
<TextBlock Text="{TemplateBinding Description}" FontSize="11"
Foreground="{StaticResource MutedBrush}" TextWrapping="Wrap"
IsVisible="{Binding Description, RelativeSource={RelativeSource TemplatedParent},
Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="10" VerticalAlignment="Center">
<ToggleSwitch OnContent="Override" OffContent="Override" MinWidth="0"
VerticalAlignment="Center"
IsVisible="{TemplateBinding ShowOverride}"
IsChecked="{Binding IsOverridden, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
<ContentPresenter x:Name="PART_Slot"
Content="{TemplateBinding Content}"
VerticalAlignment="Center" />
</StackPanel>
</Grid>
<Border x:Name="PART_RowSurface"
Background="#06FFFFFF"
BorderBrush="#0AFFFFFF"
BorderThickness="1"
CornerRadius="14"
Padding="18,12">
<Grid ColumnDefinitions="*,Auto">
<StackPanel VerticalAlignment="Center" Spacing="3" Margin="0,0,18,0">
<TextBlock x:Name="PART_Label"
Text="{TemplateBinding Label}"
FontSize="14"
FontWeight="Medium"
TextWrapping="Wrap"
Foreground="{StaticResource TextBrush}" />
<TextBlock Text="{TemplateBinding Description}"
FontSize="11"
FontWeight="Normal"
Foreground="{StaticResource MutedBrush}"
LineHeight="16"
MaxWidth="690"
HorizontalAlignment="Left"
TextAlignment="Left"
TextWrapping="Wrap"
IsVisible="{Binding Description, RelativeSource={RelativeSource TemplatedParent},
Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
</StackPanel>
<StackPanel Grid.Column="1"
Orientation="Horizontal"
Spacing="12"
VerticalAlignment="Center">
<ToggleSwitch OnContent="Override"
OffContent="Override"
MinWidth="0"
VerticalAlignment="Center"
IsVisible="{TemplateBinding ShowOverride}"
IsChecked="{Binding IsOverridden, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
<ContentPresenter x:Name="PART_Slot"
Content="{TemplateBinding Content}"
VerticalAlignment="Center" />
</StackPanel>
</Grid>
</Border>
</ControlTemplate>
</Setter>
</ControlTheme>
@@ -0,0 +1,197 @@
<!--
Copyright (C) 2026 SharpEmu Emulator Project
SPDX-License-Identifier: GPL-2.0-or-later
Control themes for SplitNumericUpDown and its spinner parts
-->
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:settingsControls="using:SharpEmu.GUI.Controls.Settings">
<ControlTheme x:Key="SplitNumericRepeatButtonTheme" TargetType="RepeatButton">
<Setter Property="MinWidth" Value="0" />
<Setter Property="MinHeight" Value="0" />
<Setter Property="Padding" Value="0" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Foreground" Value="#B8FFFFFF" />
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="FocusAdorner" Value="{x:Null}" />
<Setter Property="Template">
<ControlTemplate>
<ContentPresenter x:Name="PART_ContentPresenter"
Background="{TemplateBinding Background}"
BorderBrush="Transparent"
BorderThickness="0"
Content="{TemplateBinding Content}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
<ContentPresenter.Transitions>
<Transitions>
<BrushTransition Property="Background"
Duration="0:0:0.18"
Easing="CubicEaseOut" />
<BrushTransition Property="Foreground"
Duration="0:0:0.18"
Easing="CubicEaseOut" />
</Transitions>
</ContentPresenter.Transitions>
</ContentPresenter>
</ControlTemplate>
</Setter>
<Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="#16FFFFFF" />
<Setter Property="Foreground" Value="White" />
</Style>
<Style Selector="^:pressed /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="#22FFFFFF" />
<Setter Property="Foreground" Value="White" />
</Style>
<Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Opacity" Value="0.45" />
</Style>
</ControlTheme>
<ControlTheme x:Key="SplitNumericSpinnerTheme" TargetType="ButtonSpinner">
<Setter Property="MinHeight" Value="44" />
<Setter Property="MinWidth" Value="0" />
<Setter Property="Padding" Value="0" />
<Setter Property="Background" Value="#12FFFFFF" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Foreground" Value="#E8FFFFFF" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="VerticalContentAlignment" Value="Stretch" />
<Setter Property="Focusable" Value="True" />
<Setter Property="Template">
<ControlTemplate>
<Grid ColumnDefinitions="*,52"
ColumnSpacing="8">
<Border x:Name="PART_ValueSurface"
MinHeight="{TemplateBinding MinHeight}"
Background="{TemplateBinding Background}"
BorderBrush="Transparent"
BorderThickness="0"
CornerRadius="14"
ClipToBounds="True">
<ContentPresenter x:Name="PART_ContentPresenter"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
Padding="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
<Border.Transitions>
<Transitions>
<BrushTransition Property="Background"
Duration="0:0:0.18"
Easing="CubicEaseOut" />
</Transitions>
</Border.Transitions>
</Border>
<Border x:Name="PART_SpinnerSurface"
Grid.Column="1"
MinHeight="{TemplateBinding MinHeight}"
Background="{TemplateBinding Background}"
BorderBrush="Transparent"
BorderThickness="0"
CornerRadius="14"
ClipToBounds="True"
IsVisible="{TemplateBinding ShowButtonSpinner}">
<Grid RowDefinitions="*,*">
<RepeatButton x:Name="PART_IncreaseButton"
Grid.Row="0"
Theme="{StaticResource SplitNumericRepeatButtonTheme}"
IsTabStop="{TemplateBinding IsTabStop}">
<TextBlock Classes="materialSymbol compact"
Text="keyboard_arrow_up" />
</RepeatButton>
<RepeatButton x:Name="PART_DecreaseButton"
Grid.Row="1"
Theme="{StaticResource SplitNumericRepeatButtonTheme}"
IsTabStop="{TemplateBinding IsTabStop}">
<TextBlock Classes="materialSymbol compact"
Text="keyboard_arrow_down" />
</RepeatButton>
<Border Height="1"
Grid.RowSpan="2"
Background="#14FFFFFF"
VerticalAlignment="Center"
IsHitTestVisible="False" />
</Grid>
<Border.Transitions>
<Transitions>
<BrushTransition Property="Background"
Duration="0:0:0.18"
Easing="CubicEaseOut" />
</Transitions>
</Border.Transitions>
</Border>
</Grid>
</ControlTemplate>
</Setter>
<Style Selector="^:pointerover /template/ Border#PART_ValueSurface,
^:focus-within /template/ Border#PART_ValueSurface">
<Setter Property="Background" Value="#20FFFFFF" />
</Style>
<Style Selector="^:pointerover /template/ Border#PART_SpinnerSurface,
^:focus-within /template/ Border#PART_SpinnerSurface">
<Setter Property="Background" Value="#20FFFFFF" />
</Style>
</ControlTheme>
<ControlTheme x:Key="{x:Type settingsControls:SplitNumericUpDown}"
TargetType="settingsControls:SplitNumericUpDown">
<Setter Property="MinHeight" Value="44" />
<Setter Property="MinWidth" Value="0" />
<Setter Property="Padding" Value="0" />
<Setter Property="Background" Value="#12FFFFFF" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Foreground" Value="#E8FFFFFF" />
<Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="TextAlignment" Value="Left" />
<Setter Property="Template">
<ControlTemplate>
<DataValidationErrors>
<ButtonSpinner x:Name="PART_Spinner"
Theme="{StaticResource SplitNumericSpinnerTheme}"
Background="{TemplateBinding Background}"
BorderBrush="Transparent"
BorderThickness="0"
IsTabStop="False"
Padding="0"
MinWidth="0"
HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Stretch"
AllowSpin="{TemplateBinding AllowSpin}"
ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
<TextBox x:Name="PART_TextBox"
Classes="splitNumericTextBox"
MinHeight="{TemplateBinding MinHeight}"
MinWidth="0"
Margin="0"
Padding="17,0"
Background="Transparent"
BorderBrush="Transparent"
BorderThickness="0"
Foreground="{TemplateBinding Foreground}"
PlaceholderText="{TemplateBinding PlaceholderText}"
PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
IsReadOnly="{TemplateBinding IsReadOnly}"
VerticalContentAlignment="Center"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
Text="{TemplateBinding Text}"
TextAlignment="{TemplateBinding TextAlignment}"
AcceptsReturn="False"
TextWrapping="NoWrap"
InnerLeftContent="{Binding InnerLeftContent, RelativeSource={RelativeSource TemplatedParent}}"
InnerRightContent="{Binding InnerRightContent, RelativeSource={RelativeSource TemplatedParent}}" />
</ButtonSpinner>
</DataValidationErrors>
</ControlTemplate>
</Setter>
</ControlTheme>
</ResourceDictionary>
+2
View File
@@ -6,6 +6,8 @@ Shared colors and brushes used throughout the launcher.
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<FontFamily x:Key="MaterialSymbolsRounded">avares://SharpEmu.GUI/Assets/Fonts/MaterialSymbolsRounded-400.ttf#Material Symbols Rounded</FontFamily>
<Color x:Key="SystemAccentColor">#7C5CFC</Color>
<LinearGradientBrush x:Key="BgBrush" StartPoint="0%,0%" EndPoint="100%,100%">