Ava UI: Various Fixes (#4268 )

* Fix saves disappearing * Better size formatter * Move TextBox alignment fix to Styles * Fix bug * Left align * Add border * Update Ryujinx.Ava/UI/Models/SaveModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Models/SaveModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Models/SaveModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Whitespace Co-authored-by: Ac_K <Acoustik666@gmail.com>
Ava UI: Settings Adjustments (#4273 )
2023-01-12 12:23:24 +00:00 · 2023-01-12 12:09:32 +00:00
12 changed files with 100 additions and 59 deletions
--- a/Ryujinx.Ava/Assets/Locales/en_US.json
+++ b/Ryujinx.Ava/Assets/Locales/en_US.json
@@ -119,7 +119,7 @@
  "SettingsTabSystemAudioBackendSoundIO": "SoundIO",
  "SettingsTabSystemAudioBackendSDL2": "SDL2",
  "SettingsTabSystemHacks": "Hacks",
-  "SettingsTabSystemHacksNote": " (may cause instability)",
+  "SettingsTabSystemHacksNote": "May cause instability",
  "SettingsTabSystemExpandDramSize": "Use alternative memory layout (Developers)",
  "SettingsTabSystemIgnoreMissingServices": "Ignore Missing Services",
  "SettingsTabGraphics": "Graphics",
@@ -157,7 +157,8 @@
  "SettingsTabLoggingEnableGuestLogs": "Enable Guest Logs",
  "SettingsTabLoggingEnableFsAccessLogs": "Enable Fs Access Logs",
  "SettingsTabLoggingFsGlobalAccessLogMode": "Fs Global Access Log Mode:",
-  "SettingsTabLoggingDeveloperOptions": "Developer Options (WARNING: Will reduce performance)",
+  "SettingsTabLoggingDeveloperOptions": "Developer Options",
+  "SettingsTabLoggingDeveloperOptionsNote": "WARNING: Will reduce performance",
  "SettingsTabLoggingGraphicsBackendLogLevel": "Graphics Backend Log Level:",
  "SettingsTabLoggingGraphicsBackendLogLevelNone": "None",
  "SettingsTabLoggingGraphicsBackendLogLevelError": "Error",
@@ -618,4 +619,4 @@
  "UserProfilesRecoverEmptyList": "No profiles to recover",
  "UserEditorTitle" : "Edit User",
  "UserEditorTitleCreate" : "Create User"
-}
+}
--- a/Ryujinx.Ava/Assets/Styles/BaseDark.xaml
+++ b/Ryujinx.Ava/Assets/Styles/BaseDark.xaml
@@ -60,5 +60,6 @@
        <Color x:Key="MenuFlyoutPresenterBorderColor">#3D3D3D</Color>
        <Color x:Key="AppListBackgroundColor">#0FFFFFFF</Color>
        <Color x:Key="AppListHoverBackgroundColor">#1EFFFFFF</Color>
+        <Color x:Key="SecondaryTextColor">#A0FFFFFF</Color>
    </Styles.Resources>
 </Styles>
--- a/Ryujinx.Ava/Assets/Styles/BaseLight.xaml
+++ b/Ryujinx.Ava/Assets/Styles/BaseLight.xaml
@@ -52,5 +52,6 @@
        <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
        <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
        <Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
+        <Color x:Key="SecondaryTextColor">#A0000000</Color>
    </Styles.Resources>
 </Styles>
--- a/Ryujinx.Ava/Assets/Styles/Styles.xaml
+++ b/Ryujinx.Ava/Assets/Styles/Styles.xaml
@@ -56,8 +56,8 @@
    <Style Selector="Border.settings">
        <Setter Property="Background" Value="{DynamicResource ThemeDarkColor}" />
        <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderColor}" />
-        <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="CornerRadius" Value="3" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="CornerRadius" Value="5" />
    </Style>
    <Style Selector="Image.small">
        <Setter Property="Width" Value="50" />
@@ -234,6 +234,9 @@
        <Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
        <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
    </Style>
+    <Style Selector="TextBox">
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+    </Style>
    <Style Selector="TextBox.NumberBoxTextBoxStyle">
        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
    </Style>
@@ -303,6 +306,9 @@
        <Color x:Key="ThemeControlBorderColor">#FF505050</Color>
        <Color x:Key="VsyncEnabled">#FF2EEAC9</Color>
        <Color x:Key="VsyncDisabled">#FFFF4554</Color>
+        <Color x:Key="AppListBackgroundColor">#0FFFFFFF</Color>
+        <Color x:Key="AppListHoverBackgroundColor">#1EFFFFFF</Color>
+        <Color x:Key="SecondaryTextColor">#A0FFFFFF</Color>
        <x:Double x:Key="ScrollBarThickness">15</x:Double>
        <x:Double x:Key="FontSizeSmall">8</x:Double>
        <x:Double x:Key="FontSizeNormal">10</x:Double>
--- a/Ryujinx.Ava/UI/Models/SaveModel.cs
+++ b/Ryujinx.Ava/UI/Models/SaveModel.cs
@@ -1,13 +1,9 @@
-using LibHac;
 using LibHac.Fs;
-using LibHac.Fs.Shim;
 using LibHac.Ncm;
-using Ryujinx.Ava.Common;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.HLE.FileSystem;
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -16,7 +12,6 @@ namespace Ryujinx.Ava.UI.Models
 {
    public class SaveModel : BaseModel
    {
-        private readonly HorizonClient _horizonClient;
        private long _size;

        public ulong SaveId { get; }
@@ -41,11 +36,29 @@ namespace Ryujinx.Ava.UI.Models

        public bool SizeAvailable { get; set; }

-        public string SizeString => $"{((float)_size * 0.000000954):0.###}MB";
+        public string SizeString => GetSizeString();

-        public SaveModel(SaveDataInfo info, HorizonClient horizonClient, VirtualFileSystem virtualFileSystem)
+        private string GetSizeString()
+        {
+            const int scale = 1024;
+            string[] orders = { "GiB", "MiB", "KiB" };
+            long max = (long)Math.Pow(scale, orders.Length);
+
+            foreach (string order in orders)
+            {
+                if (Size > max)
+                {
+                    return $"{decimal.Divide(Size, max):##.##} {order}";
+                }
+
+                max /= scale;
+            }
+
+            return "0 KiB";
+        }
+
+        public SaveModel(SaveDataInfo info, VirtualFileSystem virtualFileSystem)
        {
-            _horizonClient = horizonClient;
            SaveId = info.SaveDataId;
            TitleId = info.ProgramId;
            UserId = info.UserId;
--- a/Ryujinx.Ava/UI/ViewModels/UserSaveManagerViewModel.cs
+++ b/Ryujinx.Ava/UI/ViewModels/UserSaveManagerViewModel.cs
@@ -13,8 +13,8 @@ namespace Ryujinx.Ava.UI.ViewModels
        private int _sortIndex;
        private int _orderIndex;
        private string _search;
-        private ObservableCollection<SaveModel> _saves;
-        private ObservableCollection<SaveModel> _views;
+        private ObservableCollection<SaveModel> _saves = new();
+        private ObservableCollection<SaveModel> _views = new();
        private AccountManager _accountManager;

        public string SaveManagerHeading =>
@@ -77,8 +77,6 @@ namespace Ryujinx.Ava.UI.ViewModels
        public UserSaveManagerViewModel(AccountManager accountManager)
        {
            _accountManager = accountManager;
-            _saves = new ObservableCollection<SaveModel>();
-            _views = new ObservableCollection<SaveModel>();
        }

        public void Sort()
--- a/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml
+++ b/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml
@@ -74,7 +74,6 @@
            Margin="5,0,5,0"
            HorizontalAlignment="Right"
            VerticalAlignment="Center"
-            VerticalContentAlignment="Center"
            DockPanel.Dock="Right"
            KeyUp="SearchBox_OnKeyUp"
            Text="{Binding SearchText}"
--- 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}"
--- 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"
--- a/Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml
+++ b/Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml
@@ -55,6 +55,11 @@
                            HorizontalContentAlignment="Left"
                            Content="{locale:Locale Size}" />
                    </ComboBoxItem>
+                    <ComboBox.Styles>
+                        <Style Selector="ContentControl#ContentPresenter">
+                            <Setter Property="HorizontalAlignment" Value="Left" />
+                        </Style>
+                    </ComboBox.Styles>
                </ComboBox>
                <ComboBox SelectedIndex="{Binding OrderIndex}" Width="150">
                    <ComboBoxItem>
@@ -69,6 +74,11 @@
                            HorizontalContentAlignment="Left"
                            Content="{locale:Locale OrderDescending}" />
                    </ComboBoxItem>
+                    <ComboBox.Styles>
+                        <Style Selector="ContentControl#ContentPresenter">
+                            <Setter Property="HorizontalAlignment" Value="Left" />
+                        </Style>
+                    </ComboBox.Styles>
                </ComboBox>
            </StackPanel>
            <Grid
@@ -122,6 +132,8 @@
                                    Height="42"
                                    Width="42"
                                    Padding="10"
+                                    BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
+                                    BorderThickness="1"
                                    IsVisible="{Binding !InGameList}">
                                    <ui:SymbolIcon
                                        Symbol="Help"
--- a/Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs
+++ b/Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs
@@ -94,7 +94,7 @@ namespace Ryujinx.Ava.UI.Views.User
                    var save = saveDataInfo[i];
                    if (save.ProgramId.Value != 0)
                    {
-                        var saveModel = new SaveModel(save, _horizonClient, _virtualFileSystem);
+                        var saveModel = new SaveModel(save, _virtualFileSystem);
                        saves.Add(saveModel);
                    }
                }
@@ -137,10 +137,9 @@ namespace Ryujinx.Ava.UI.Views.User
                    if (result == UserResult.Yes)
                    {
                        _horizonClient.Fs.DeleteSaveData(SaveDataSpaceId.User, saveModel.SaveId);
+                        ViewModel.Saves.Remove(saveModel);
+                        ViewModel.Sort();
                    }
-
-                    ViewModel.Saves.Remove(saveModel);
-                    ViewModel.Views.Remove(saveModel);
                }
            }
        }
--- 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>