From 5d0fc6d456c2100e011df8ed9cde0d9fe3030b01 Mon Sep 17 00:00:00 2001
From: _Neo_ <ursamajorjanus2819@gmail.com>
Date: Sat, 17 Jan 2026 17:21:37 +0200
Subject: [PATCH] Minor cleanup

Going over changed files and adjusting structure and looks
---
 .../UI/Applet/ProfileSelectorDialog.axaml      |  2 +-
 .../UI/Controls/ApplicationContextMenu.axaml   | 18 +++++++++---------
 src/Ryujinx/UI/Views/User/UserEditorView.axaml |  2 +-
 .../User/UserFirmwareAvatarSelectorView.axaml  | 16 ++++++++--------
 .../UserFirmwareAvatarSelectorView.axaml.cs    |  2 +-
 .../UI/Views/User/UserRecovererView.axaml      | 14 +++++++-------
 .../UI/Views/User/UserSaveManagerView.axaml    |  8 ++++----
 .../UI/Views/User/UserSelectorView.axaml       |  8 ++++----
 8 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml b/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml
index f76ef150b..5700d6ed5 100644
--- a/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml
+++ b/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml
@@ -17,7 +17,7 @@
         <viewModels:ProfileSelectorDialogViewModel />
     </Design.DataContext>
     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
-        <Border BorderThickness="0" Padding="-3">
+        <Border Padding="-3" BorderThickness="0">
             <ListBox
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
index da63dd548..64290bbaf 100755
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
@@ -9,7 +9,7 @@
         Command="{Binding RunApplication}"
         CommandParameter="{Binding}"
         Header="{ext:Locale GameListContextMenuRunApplication}"
-        Icon="{ext:Icon fa-solid fa-play}"/>
+        Icon="{ext:Icon fa-solid fa-play}" />
     <MenuItem
         Command="{Binding ToggleFavorite}"
         CommandParameter="{Binding}"
@@ -30,15 +30,15 @@
         ToolTip.Tip="{ext:Locale EditCustomConfigurationToolTip}" />
     <MenuItem
         Command="{Binding EditGameConfiguration}"
-       CommandParameter="{Binding}"
-       IsVisible="{Binding !SelectedApplication.HasIndependentConfiguration}"
-       Header="{ext:Locale GameListContextMenuCreateCustomConfiguration}"
-       Icon="{ext:Icon fa-solid fa-gear}"
-       ToolTip.Tip="{ext:Locale CreateCustomConfigurationToolTip}" />
+        CommandParameter="{Binding}"
+        IsVisible="{Binding !SelectedApplication.HasIndependentConfiguration}"
+        Header="{ext:Locale GameListContextMenuCreateCustomConfiguration}"
+        Icon="{ext:Icon fa-solid fa-gear}"
+        ToolTip.Tip="{ext:Locale CreateCustomConfigurationToolTip}" />
     <MenuItem
-        IsVisible="{Binding HasCompatibilityEntry}"
         Command="{Binding OpenApplicationCompatibility}"
         CommandParameter="{Binding}"
+        IsVisible="{Binding HasCompatibilityEntry}"
         Header="{ext:Locale GameListContextMenuShowCompatEntry}"
         Icon="{ext:Icon fa-solid fa-database}"
         ToolTip.Tip="{ext:Locale GameListContextMenuShowCompatEntryToolTip}"/>
@@ -104,8 +104,8 @@
         Command="{Binding TrimXci}"
         CommandParameter="{Binding}"
 		Header="{ext:Locale GameListContextMenuTrimXCI}"
-        IsEnabled="{Binding TrimXCIEnabled}"
         Icon="{ext:Icon fa-solid fa-scissors}"
+        IsEnabled="{Binding TrimXCIEnabled}"
 		ToolTip.Tip="{ext:Locale GameListContextMenuTrimXCIToolTip}" />
     <MenuItem Header="{ext:Locale GameListContextMenuCacheManagement}" Icon="{ext:Icon fa-solid fa-memory}">
         <MenuItem
@@ -151,9 +151,9 @@
             Header="{ext:Locale GameListContextMenuExtractDataRomFS}"
             ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataRomFSToolTip}" />
         <MenuItem
-            IsVisible="{Binding HasDlc}"
             Command="{Binding ExtractApplicationAocRomFs}"
             CommandParameter="{Binding}"
+            IsVisible="{Binding HasDlc}"
             Header="{ext:Locale GameListContextMenuExtractDataAocRomFS}"
             ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataAocRomFSToolTip}" />
         <MenuItem
diff --git a/src/Ryujinx/UI/Views/User/UserEditorView.axaml b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
index 142a00349..2783463c2 100644
--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
@@ -8,8 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
-    MinWidth="500"
     mc:Ignorable="d"
+    MinWidth="500"
     Focusable="True"
     x:DataType="models:TempProfile">
     <Grid Margin="0,10,0,0" ColumnDefinitions="Auto,*" RowDefinitions="*,Auto">
diff --git a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
index e15eb6377..7bd933286 100644
--- a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
@@ -1,19 +1,19 @@
 <UserControl
+    x:Class="Ryujinx.Ava.UI.Views.User.UserFirmwareAvatarSelectorView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
+    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
+    d:DesignHeight="350"
+    d:DesignWidth="578"
     mc:Ignorable="d"
     Width="528"
-    d:DesignWidth="578"
-    d:DesignHeight="350"
-    x:Class="Ryujinx.Ava.UI.Views.User.UserFirmwareAvatarSelectorView"
-    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    x:DataType="viewModels:UserFirmwareAvatarSelectorViewModel"
-    Focusable="True">
+    Focusable="True"
+    x:DataType="viewModels:UserFirmwareAvatarSelectorViewModel">
     <Design.DataContext>
         <viewModels:UserFirmwareAvatarSelectorViewModel />
     </Design.DataContext>
diff --git a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
index 648d3e05a..a8da3fb4f 100644
--- a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
+++ b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
@@ -2,9 +2,9 @@ using Avalonia.Interactivity;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Navigation;
+using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using SkiaSharp;
diff --git a/src/Ryujinx/UI/Views/User/UserRecovererView.axaml b/src/Ryujinx/UI/Views/User/UserRecovererView.axaml
index 3775d8cc8..092f82219 100644
--- a/src/Ryujinx/UI/Views/User/UserRecovererView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserRecovererView.axaml
@@ -1,19 +1,19 @@
 <UserControl
+    x:Class="Ryujinx.Ava.UI.Views.User.UserRecovererView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
+    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     d:DesignWidth="550"
     d:DesignHeight="450"
+    mc:Ignorable="d"
     Width="500"
     Height="400"
-    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    x:Class="Ryujinx.Ava.UI.Views.User.UserRecovererView"
-    x:DataType="viewModels:UserProfileViewModel"
-    Focusable="True">
+    Focusable="True"
+    x:DataType="viewModels:UserProfileViewModel">
     <Design.DataContext>
         <viewModels:UserProfileViewModel />
     </Design.DataContext>
diff --git a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
index b7d71bdba..c00b79a28 100644
--- a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
@@ -1,10 +1,11 @@
 <UserControl
+    x:Class="Ryujinx.Ava.UI.Views.User.UserSaveManagerView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
@@ -13,7 +14,6 @@
     d:DesignHeight="500"
     Height="450"
     Width="550"
-    x:Class="Ryujinx.Ava.UI.Views.User.UserSaveManagerView"
     x:DataType="viewModels:UserSaveManagerViewModel"
     Focusable="True">
     <Design.DataContext>
diff --git a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
index 19a6ff08a..a6d515852 100644
--- a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
@@ -4,15 +4,15 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     d:DesignHeight="450"
-    MinWidth="500"
     d:DesignWidth="800"
     mc:Ignorable="d"
+    MinWidth="500"
     Focusable="True"
     x:DataType="viewModels:UserProfileViewModel">
     <Design.DataContext>
@@ -88,10 +88,10 @@
                                 Background="{DynamicResource ThemeContentBackgroundColor}"
                                 IsVisible="{Binding IsPointerOver}">
                                 <Button
-                                    MaxHeight="24"
-                                    MaxWidth="24"
                                     MinHeight="24"
                                     MinWidth="24"
+                                    MaxHeight="24"
+                                    MaxWidth="24"
                                     CornerRadius="12"
                                     Padding="0"
                                     Click="EditUser">