diff options
| author | Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com> | 2023-01-12 07:09:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-12 12:09:32 +0000 |
| commit | fe29a2ff6e7ae94b9e1f8cedc93d7fd0187de3cf (patch) | |
| tree | f5620fb38a4e9edeb9073b8453917d59f6dd0080 /Ryujinx.Ava/UI/Views | |
| parent | e9a173e00ce199117f73626c075f89feedfb31ce (diff) | |
Ava UI: Settings Adjustments (#4273)
* Visual adjustments
* Match border to rest of app
* Fix overlapping controls
* Fix
* Fix
Diffstat (limited to 'Ryujinx.Ava/UI/Views')
| -rw-r--r-- | Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml | 21 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml | 8 |
2 files changed, 16 insertions, 13 deletions
diff --git a/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml b/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml index 2163dcda..948e7181 100644 --- a/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml +++ b/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml @@ -1,4 +1,4 @@ -<UserControl +<UserControl x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsLoggingView" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" @@ -47,31 +47,34 @@ ToolTip.Tip="{locale:Locale ErrorLogTooltip}"> <TextBlock Text="{locale:Locale SettingsTabLoggingEnableErrorLogs}" /> </CheckBox> - <CheckBox IsChecked="{Binding EnableTrace}" - ToolTip.Tip="{locale:Locale TraceLogTooltip}"> - <TextBlock Text="{locale:Locale SettingsTabLoggingEnableTraceLogs}" /> - </CheckBox> <CheckBox IsChecked="{Binding EnableGuest}" ToolTip.Tip="{locale:Locale GuestLogTooltip}"> <TextBlock Text="{locale:Locale SettingsTabLoggingEnableGuestLogs}" /> </CheckBox> </StackPanel> <Separator Height="1" /> - <TextBlock Classes="h1" Text="{locale:Locale SettingsTabLoggingDeveloperOptions}" /> + <StackPanel Orientation="Vertical" Spacing="2"> + <TextBlock Classes="h1" Text="{locale:Locale SettingsTabLoggingDeveloperOptions}" /> + <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{locale:Locale SettingsTabLoggingDeveloperOptionsNote}" /> + </StackPanel> <StackPanel Margin="10,0,0,0" HorizontalAlignment="Stretch" Orientation="Vertical" Spacing="10"> <StackPanel Orientation="Vertical"> - <CheckBox IsChecked="{Binding EnableDebug}" - ToolTip.Tip="{locale:Locale DebugLogTooltip}"> - <TextBlock Text="{locale:Locale SettingsTabLoggingEnableDebugLogs}" /> + <CheckBox IsChecked="{Binding EnableTrace}" + ToolTip.Tip="{locale:Locale TraceLogTooltip}"> + <TextBlock Text="{locale:Locale SettingsTabLoggingEnableTraceLogs}" /> </CheckBox> <CheckBox IsChecked="{Binding EnableFsAccessLog}" ToolTip.Tip="{locale:Locale FileAccessLogTooltip}"> <TextBlock Text="{locale:Locale SettingsTabLoggingEnableFsAccessLogs}" /> </CheckBox> + <CheckBox IsChecked="{Binding EnableDebug}" + ToolTip.Tip="{locale:Locale DebugLogTooltip}"> + <TextBlock Text="{locale:Locale SettingsTabLoggingEnableDebugLogs}" /> + </CheckBox> <StackPanel Margin="0,10,0,0" Orientation="Horizontal" VerticalAlignment="Stretch"> <TextBlock VerticalAlignment="Center" ToolTip.Tip="{locale:Locale FSAccessLogModeTooltip}" diff --git a/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml b/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml index ddcca39c..1d4f040f 100644 --- a/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml +++ b/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml @@ -1,4 +1,4 @@ -<UserControl +<UserControl x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsSystemView" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" @@ -12,7 +12,7 @@ <Design.DataContext> <viewModels:SettingsViewModel /> </Design.DataContext> - <ScrollViewer + <ScrollViewer Name="SystemPage" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" @@ -172,9 +172,9 @@ </CheckBox> </StackPanel> <Separator Height="1" /> - <StackPanel Orientation="Horizontal"> + <StackPanel Orientation="Vertical" Spacing="2"> <TextBlock Classes="h1" Text="{locale:Locale SettingsTabSystemHacks}" /> - <TextBlock Text="{locale:Locale SettingsTabSystemHacksNote}" /> + <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{locale:Locale SettingsTabSystemHacksNote}" /> </StackPanel> <StackPanel Margin="10,0,0,0" |