JJBanana13/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-06-27 06:39:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Update Avalonia to 11.3.6, FluentAvalonia to 2.4.0 (ryubing/ryujinx!118)

Browse Source 
See merge request ryubing/ryujinx!118
This commit is contained in:
KeatonTheBot
2025-10-25 00:29:51 -05:00
committed by GreemDev
parent 49cbe4b328
commit c6bc77e4bf
12 changed files with 243 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Ryujinx/UI/Views/User/UserEditorView.axaml
View File

@@ -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>

45
src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
View File

@@ -22,44 +22,33 @@
<Grid RowDefinitions="Auto,*,Auto">
<Grid
Grid.Row="0"
Margin="0,0,0,5"
HorizontalAlignment="Stretch" ColumnDefinitions="Auto,*">
<StackPanel
Spacing="10"
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" />
@@ -71,9 +60,9 @@
Grid.Column="1"
HorizontalAlignment="Stretch"
Margin="10,0, 0, 0" ColumnDefinitions="Auto,*">
<Label Content="{ext:Locale Search}" VerticalAlignment="Center" />
<TextBlock Text="{ext:Locale Search}" VerticalAlignment="Center" />
<TextBox
Margin="5,0,0,0"
Margin="10,0,0,0"
Grid.Column="1"
HorizontalAlignment="Stretch"
Text="{Binding Search}" />

15
src/Ryujinx/UI/Views/User/UserSelectorView.axaml
View File

@@ -136,11 +136,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"
@@ -148,8 +150,9 @@
HorizontalAlignment="Right"
Orientation="Horizontal">
<Button
Click="Close"
Content="{ext:Locale UserProfilesClose}" />
Click="Close">
<TextBlock Text="{ext:Locale UserProfilesClose}" />
</Button>
</StackPanel>
</Grid>
</UserControl>