mirror of
https://git.ryujinx.app/kenji-nx/ryujinx.git
synced 2025-12-12 10:37:06 +00:00
UI: Update Avalonia to 11.3.4
* Fix text and ComboBox alignment in Save Manager
This commit is contained in:
parent
d73ef0e3fb
commit
121bb5dc76
2 changed files with 25 additions and 40 deletions
|
|
@ -3,13 +3,13 @@
|
|||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageVersion Include="Avalonia" Version="11.3.2" />
|
||||
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
|
||||
<PackageVersion Include="Avalonia.Desktop" Version="11.3.2" />
|
||||
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.2" />
|
||||
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.2" />
|
||||
<PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.0.2" />
|
||||
<PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.0.2" />
|
||||
<PackageVersion Include="Avalonia" Version="11.3.4" />
|
||||
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.4" />
|
||||
<PackageVersion Include="Avalonia.Desktop" Version="11.3.4" />
|
||||
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.4" />
|
||||
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.4" />
|
||||
<PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.0.3" />
|
||||
<PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.0.3" />
|
||||
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
|
||||
<PackageVersion Include="Concentus" Version="2.2.2" />
|
||||
<PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
RowDefinitions="Auto,*,Auto">
|
||||
<Grid
|
||||
Grid.Row="0"
|
||||
Margin="0,0,0,5"
|
||||
HorizontalAlignment="Stretch"
|
||||
ColumnDefinitions="Auto,*">
|
||||
<StackPanel
|
||||
|
|
@ -33,43 +34,27 @@
|
|||
Orientation="Horizontal"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center">
|
||||
<Label Content="{locale:Locale CommonSort}" VerticalAlignment="Center" />
|
||||
<ComboBox SelectedIndex="{Binding SortIndex}" Width="100">
|
||||
<ComboBoxItem>
|
||||
<Label
|
||||
VerticalAlignment="Center"
|
||||
HorizontalContentAlignment="Left">
|
||||
<TextBlock Text="{locale:Locale Name}" />
|
||||
</Label>
|
||||
</ComboBoxItem>
|
||||
<ComboBoxItem>
|
||||
<Label
|
||||
VerticalAlignment="Center"
|
||||
HorizontalContentAlignment="Left">
|
||||
<TextBlock Text="{locale:Locale Size}" />
|
||||
</Label>
|
||||
</ComboBoxItem>
|
||||
<TextBlock Text="{locale:Locale CommonSort}" VerticalAlignment="Center" />
|
||||
<ComboBox SelectedIndex="{Binding SortIndex}"
|
||||
HorizontalContentAlignment="Left"
|
||||
MinWidth="100">
|
||||
<ComboBoxItem
|
||||
Content="{locale:Locale Name}" />
|
||||
<ComboBoxItem
|
||||
Content="{locale: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">
|
||||
<TextBlock Text="{locale:Locale OrderAscending}" />
|
||||
</Label>
|
||||
</ComboBoxItem>
|
||||
<ComboBoxItem>
|
||||
<Label
|
||||
VerticalAlignment="Center"
|
||||
HorizontalContentAlignment="Left">
|
||||
<TextBlock Text="{locale:Locale OrderDescending}" />
|
||||
</Label>
|
||||
</ComboBoxItem>
|
||||
<ComboBox SelectedIndex="{Binding OrderIndex}"
|
||||
HorizontalContentAlignment="Left"
|
||||
MinWidth="150">
|
||||
<ComboBoxItem
|
||||
Content="{locale:Locale OrderAscending}" />
|
||||
<ComboBoxItem
|
||||
Content="{locale:Locale OrderDescending}" />
|
||||
<ComboBox.Styles>
|
||||
<Style Selector="ContentControl#ContentPresenter">
|
||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
||||
|
|
@ -82,9 +67,9 @@
|
|||
HorizontalAlignment="Stretch"
|
||||
Margin="10,0,0,0"
|
||||
ColumnDefinitions="Auto,*">
|
||||
<Label Content="{locale:Locale Search}" VerticalAlignment="Center" />
|
||||
<TextBlock Text="{locale:Locale Search}" VerticalAlignment="Center" />
|
||||
<TextBox
|
||||
Margin="5,0,0,0"
|
||||
Margin="10,0,0,0"
|
||||
Grid.Column="1"
|
||||
HorizontalAlignment="Stretch"
|
||||
Text="{Binding Search}" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue