From fe29a2ff6e7ae94b9e1f8cedc93d7fd0187de3cf Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com>
Date: Thu, 12 Jan 2023 07:09:32 -0500
Subject: Ava UI: Settings Adjustments (#4273)

* Visual adjustments

* Match border to rest of app

* Fix overlapping controls

* Fix

* Fix
---
 Ryujinx.Ava/UI/Windows/SettingsWindow.axaml | 54 +++++++++++++++++------------
 1 file changed, 31 insertions(+), 23 deletions(-)

(limited to 'Ryujinx.Ava/UI/Windows')

diff --git a/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml b/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml
index 851e9b5b..a44cbfe7 100644
--- a/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml
+++ b/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml
@@ -44,20 +44,22 @@
             <settings:SettingsNetworkView Name="NetworkPage" />
             <settings:SettingsLoggingView Name="LoggingPage" />
         </Grid>
-        <ui:NavigationView Grid.Row="1"
-                           IsSettingsVisible="False"
-                           Name="NavPanel"
-                           IsBackEnabled="False"
-                           PaneDisplayMode="Left"
-                           Margin="2,10,10,0"
-                           VerticalAlignment="Stretch"
-                           HorizontalAlignment="Stretch"
-                           OpenPaneLength="200">
+        <ui:NavigationView
+            Grid.Row="1"
+            IsSettingsVisible="False"
+            Name="NavPanel"
+            IsBackEnabled="False"
+            PaneDisplayMode="Left"
+            Margin="2,10,10,0"
+            VerticalAlignment="Stretch"
+            HorizontalAlignment="Stretch"
+            OpenPaneLength="200">
             <ui:NavigationView.MenuItems>
-                <ui:NavigationViewItem IsSelected="True"
-                                       Content="{locale:Locale SettingsTabGeneral}"
-                                       Tag="UiPage"
-                                       Icon="New" />
+                <ui:NavigationViewItem
+                    IsSelected="True"
+                    Content="{locale:Locale SettingsTabGeneral}"
+                    Tag="UiPage"
+                    Icon="New" />
                 <ui:NavigationViewItem
                     Content="{locale:Locale SettingsTabInput}"
                     Tag="InputPage"
@@ -74,8 +76,9 @@
                     Content="{locale:Locale SettingsTabCpu}"
                     Tag="CpuPage">
                     <ui:NavigationViewItem.Icon>
-                        <ui:FontIcon FontFamily="avares://Ryujinx.Ava/Assets/Fonts#Segoe Fluent Icons"
-                                     Glyph="{helpers:GlyphValueConverter Chip}" />
+                        <ui:FontIcon
+                            FontFamily="avares://Ryujinx.Ava/Assets/Fonts#Segoe Fluent Icons"
+                            Glyph="{helpers:GlyphValueConverter Chip}" />
                     </ui:NavigationViewItem.Icon>
                 </ui:NavigationViewItem>
                 <ui:NavigationViewItem
@@ -95,6 +98,11 @@
                     Tag="LoggingPage"
                     Icon="Document" />
             </ui:NavigationView.MenuItems>
+            <ui:NavigationView.Styles>
+                <Style Selector="Grid#PlaceholderGrid">
+                    <Setter Property="Height" Value="40" />
+                </Style>
+            </ui:NavigationView.Styles>
         </ui:NavigationView>
         <ReversibleStackPanel
             Grid.Row="2"
@@ -103,17 +111,17 @@
             Orientation="Horizontal"
             HorizontalAlignment="Right"
             ReverseOrder="{Binding IsMacOS}">
-            <Button 
-                HotKey="Enter" 
+            <Button
+                HotKey="Enter"
                 Classes="accent"
-                Content="{locale:Locale SettingsButtonOk}" 
+                Content="{locale:Locale SettingsButtonOk}"
                 Command="{ReflectionBinding OkButton}" />
-            <Button 
-                HotKey="Escape" 
-                Content="{locale:Locale SettingsButtonCancel}" 
+            <Button
+                HotKey="Escape"
+                Content="{locale:Locale SettingsButtonCancel}"
                 Command="{ReflectionBinding CancelButton}" />
-            <Button 
-                Content="{locale:Locale SettingsButtonApply}" 
+            <Button
+                Content="{locale:Locale SettingsButtonApply}"
                 Command="{ReflectionBinding ApplyButton}" />
         </ReversibleStackPanel>
     </Grid>
-- 
cgit v1.2.3