mirrors/kenji-nx
1
0
Fork 0
mirror of https://git.ryujinx.app/kenji-nx/ryujinx.git synced 2025-12-12 10:37:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

UI: Update Avalonia to 11.3.4

Browse source 
* Fix text and ComboBox alignment in Save Manager
This commit is contained in:
KeatonTheBot 2025-08-16 23:30:37 -05:00
parent d73ef0e3fb
commit 121bb5dc76
2 changed files with 25 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Directory.Packages.props
View file

@ -3,13 +3,13 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageVersion Include="Avalonia" Version="11.3.2" /> <PackageVersion Include="Avalonia" Version="11.3.4" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.2" /> <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.4" />
<PackageVersion Include="Avalonia.Desktop" Version="11.3.2" /> <PackageVersion Include="Avalonia.Desktop" Version="11.3.4" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.2" /> <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.4" />
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.2" /> <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.4" />
<PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.0.2" /> <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.0.3" />
<PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.0.2" /> <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.0.3" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" /> <PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="Concentus" Version="2.2.2" /> <PackageVersion Include="Concentus" Version="2.2.2" />
<PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" /> <PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />

51
src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
View file

@ -26,6 +26,7 @@
RowDefinitions="Auto,*,Auto"> RowDefinitions="Auto,*,Auto">
<Grid <Grid
Grid.Row="0" Grid.Row="0"
Margin="0,0,0,5"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
ColumnDefinitions="Auto,*"> ColumnDefinitions="Auto,*">
<StackPanel <StackPanel
@ -33,43 +34,27 @@
Orientation="Horizontal" Orientation="Horizontal"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center"> VerticalAlignment="Center">
<Label Content="{locale:Locale CommonSort}" VerticalAlignment="Center" /> <TextBlock Text="{locale:Locale CommonSort}" VerticalAlignment="Center" />
<ComboBox SelectedIndex="{Binding SortIndex}" Width="100"> <ComboBox SelectedIndex="{Binding SortIndex}"
<ComboBoxItem> HorizontalContentAlignment="Left"
<Label MinWidth="100">
VerticalAlignment="Center" <ComboBoxItem
HorizontalContentAlignment="Left"> Content="{locale:Locale Name}" />
<TextBlock Text="{locale:Locale Name}" /> <ComboBoxItem
</Label> Content="{locale:Locale Size}" />
</ComboBoxItem>
<ComboBoxItem>
<Label
VerticalAlignment="Center"
HorizontalContentAlignment="Left">
<TextBlock Text="{locale:Locale Size}" />
</Label>
</ComboBoxItem>
<ComboBox.Styles> <ComboBox.Styles>
<Style Selector="ContentControl#ContentPresenter"> <Style Selector="ContentControl#ContentPresenter">
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
</Style> </Style>
</ComboBox.Styles> </ComboBox.Styles>
</ComboBox> </ComboBox>
<ComboBox SelectedIndex="{Binding OrderIndex}" Width="150"> <ComboBox SelectedIndex="{Binding OrderIndex}"
<ComboBoxItem> HorizontalContentAlignment="Left"
<Label MinWidth="150">
VerticalAlignment="Center" <ComboBoxItem
HorizontalContentAlignment="Left"> Content="{locale:Locale OrderAscending}" />
<TextBlock Text="{locale:Locale OrderAscending}" /> <ComboBoxItem
</Label> Content="{locale:Locale OrderDescending}" />
</ComboBoxItem>
<ComboBoxItem>
<Label
VerticalAlignment="Center"
HorizontalContentAlignment="Left">
<TextBlock Text="{locale:Locale OrderDescending}" />
</Label>
</ComboBoxItem>
<ComboBox.Styles> <ComboBox.Styles>
<Style Selector="ContentControl#ContentPresenter"> <Style Selector="ContentControl#ContentPresenter">
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
@ -82,9 +67,9 @@
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Margin="10,0,0,0" Margin="10,0,0,0"
ColumnDefinitions="Auto,*"> ColumnDefinitions="Auto,*">
<Label Content="{locale:Locale Search}" VerticalAlignment="Center" /> <TextBlock Text="{locale:Locale Search}" VerticalAlignment="Center" />
<TextBox <TextBox
Margin="5,0,0,0" Margin="10,0,0,0"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Text="{Binding Search}" /> Text="{Binding Search}" />