From af5d9a90b777d0583c0eb07b7be29addd726511c Mon Sep 17 00:00:00 2001
From: _Neo_ <ursamajorjanus2819@gmail.com>
Date: Sat, 25 Oct 2025 14:52:58 +0300
Subject: [PATCH] Fixing the MR due to errors in merge

---
 .../UI/Views/User/UserEditorView.axaml        | 20 +++++----
 .../UI/Views/User/UserSaveManagerView.axaml   | 41 +++++++------------
 .../UI/Views/User/UserSelectorView.axaml      | 15 ++++---
 3 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/src/Ryujinx/UI/Views/User/UserEditorView.axaml b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
index 4d585fa86..5d280b983 100644
--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
@@ -92,20 +92,24 @@
             Spacing="10">
             <Button
                 Name="DeleteButton"
-                Click="DeleteButton_Click"
-                Content="{ext:Locale UserProfilesDelete}" />
+                Click="DeleteButton_Click">
+                <TextBlock Text="{ext:Locale UserProfilesDelete}" />
+            </Button>
             <Button
                 Name="ChangePictureButton"
-                Click="ChangePictureButton_Click"
-                Content="{ext:Locale UserProfilesChangeProfileImage}" />
+                Click="ChangePictureButton_Click">
+                <TextBlock Text="{ext:Locale UserProfilesChangeProfileImage}" />
+            </Button>
             <Button
                 Name="AddPictureButton"
-                Click="ChangePictureButton_Click"
-                Content="{ext:Locale UserProfilesSetProfileImage}" />
+                Click="ChangePictureButton_Click">
+                <TextBlock Text="{ext:Locale UserProfilesSetProfileImage}" />
+            </Button>
             <Button
                 Name="SaveButton"
-                Click="SaveButton_Click"
-                Content="{ext:Locale Save}" />
+                Click="SaveButton_Click">
+                <TextBlock Text="{ext:Locale UserProfilesSetProfileImage}" />
+            </Button>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
index d94ad7674..3ba61bea3 100644
--- a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
@@ -29,38 +29,26 @@
                 Orientation="Horizontal"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center">
-                <ComboBox SelectedIndex="{Binding SortIndex}" Width="100">
-                    <ComboBoxItem>
-                        <Label
-                            VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{ext:Locale Name}" />
-                    </ComboBoxItem>
-                    <ComboBoxItem>
-                        <Label
-                            VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{ext:Locale Size}" />
-                    </ComboBoxItem>
+                <ComboBox SelectedIndex="{Binding SortIndex}"
+                          HorizontalContentAlignment="Left"
+                          MinWidth="100">
+                    <ComboBoxItem
+                        Content="{ext:Locale Name}" />
+                    <ComboBoxItem
+                        Content="{ext:Locale Size}" />
                     <ComboBox.Styles>
                         <Style Selector="ContentControl#ContentPresenter">
                             <Setter Property="HorizontalAlignment" Value="Left" />
                         </Style>
                     </ComboBox.Styles>
                 </ComboBox>
-                <ComboBox SelectedIndex="{Binding OrderIndex}" Width="150">
-                    <ComboBoxItem>
-                        <Label
-                            VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{ext:Locale OrderAscending}" />
-                    </ComboBoxItem>
-                    <ComboBoxItem>
-                        <Label
-                            VerticalAlignment="Center"
-                            HorizontalContentAlignment="Left"
-                            Content="{ext:Locale OrderDescending}" />
-                    </ComboBoxItem>
+                <ComboBox SelectedIndex="{Binding OrderIndex}"
+                          HorizontalContentAlignment="Left"
+                          MinWidth="150">
+                    <ComboBoxItem
+                        Content="{ext:Locale OrderAscending}" />
+                    <ComboBoxItem
+                        Content="{ext:Locale OrderDescending}" />
                     <ComboBox.Styles>
                         <Style Selector="ContentControl#ContentPresenter">
                             <Setter Property="HorizontalAlignment" Value="Left" />
@@ -72,6 +60,7 @@
                 Grid.Column="1"
                 HorizontalAlignment="Stretch"
                 Margin="20,0,0,10" ColumnDefinitions="Auto,*">
+                <TextBlock Text="{ext:Locale Search}" VerticalAlignment="Center" />
                 <TextBox
                     Margin="5,0,0,0"
                     Grid.Column="1"
diff --git a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
index 2cc685215..f27c50909 100644
--- a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
@@ -137,11 +137,13 @@
             Orientation="Horizontal"
             Spacing="10">
             <Button
-                Click="ManageSaves"
-                Content="{ext:Locale UserProfilesManageSaves}" />
+                Click="ManageSaves">
+                <TextBlock Text="{ext:Locale UserProfilesManageSaves}" />
+            </Button>
             <Button
-                Click="RecoverLostAccounts"
-                Content="{ext:Locale UserProfilesRecoverLostAccounts}" />
+                Click="RecoverLostAccounts">
+                <TextBlock Text="{ext:Locale UserProfilesRecoverLostAccounts}" />
+            </Button>
         </StackPanel>
         <StackPanel
             Grid.Row="1"
@@ -149,8 +151,9 @@
             HorizontalAlignment="Right"
             Orientation="Horizontal">
             <Button
-                Click="Close"
-                Content="{ext:Locale UserProfilesClose}" />
+                Click="Close">
+                <TextBlock Text="{ext:Locale UserProfilesClose}" />
+            </Button>
         </StackPanel>
     </Grid>
 </UserControl>