Creepso/ryujinx_ryubing
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-04-20 21:52:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverts & Some Fixes

Browse source
This commit is contained in:
_Neo_ 2026-01-06 13:01:29 +02:00
parent 2941951f4d
commit 85dad79581
4 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/Ryujinx/UI/Views/User/UserEditorView.axaml
View file

@ -29,27 +29,24 @@
IsReadOnly="True" IsReadOnly="True"
Text="{Binding UserIdString}" /> Text="{Binding UserIdString}" />
</StackPanel> </StackPanel>
<Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Stretch"> <Grid Grid.Column="1">
<Border <Border
Name="ImageBox" Name="ImageBox"
BorderBrush="{DynamicResource AppListHoverBackgroundColor}" BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
BorderThickness="1" BorderThickness="1"
VerticalAlignment="Stretch"> VerticalAlignment="Bottom"
<Grid> HorizontalAlignment="Right">
<Panel>
<ui:SymbolIcon <ui:SymbolIcon
FontSize="70" FontSize="70"
Width="120" Width="120"
Height="120" Height="120"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Foreground="{DynamicResource AppListHoverBackgroundColor}" Foreground="{DynamicResource AppListHoverBackgroundColor}"
Symbol="Camera" /> Symbol="Camera" />
<Image <Image
Name="ProfileImage" Name="ProfileImage"
Width="120" Width="120"
Height="120" Height="120"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Source="{Binding Image, Converter={x:Static helpers:BitmapArrayValueConverter.Instance}}" /> Source="{Binding Image, Converter={x:Static helpers:BitmapArrayValueConverter.Instance}}" />
<Border <Border
Margin="2" Margin="2"
@ -70,17 +67,19 @@
<ui:SymbolIcon Symbol="Edit" /> <ui:SymbolIcon Symbol="Edit" />
<Button.Flyout> <Button.Flyout>
<MenuFlyout Placement="Bottom"> <MenuFlyout Placement="Bottom">
<MenuItem Header="{ext:Locale UserProfiles_ProfileImage_Import}" <MenuItem
Icon="{ext:Icon fa-solid fa-image}" Header="{ext:Locale UserProfiles_ProfileImage_Import}"
Click="Import_OnClick" /> Icon="{ext:Icon fa-solid fa-image}"
<MenuItem Header="{ext:Locale UserProfiles_ProfileImage_SelectAvatar}" Click="Import_OnClick" />
Icon="{ext:Icon fa-solid fa-floppy-disk}" <MenuItem
Click="SelectFirmwareImage_OnClick" /> Header="{ext:Locale UserProfiles_ProfileImage_SelectAvatar}"
Icon="{ext:Icon fa-solid fa-floppy-disk}"
Click="SelectFirmwareImage_OnClick" />
</MenuFlyout> </MenuFlyout>
</Button.Flyout> </Button.Flyout>
</Button> </Button>
</Border> </Border>
</Grid> </Panel>
</Border> </Border>
</Grid> </Grid>
<StackPanel <StackPanel

4
src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
View file

@ -49,6 +49,10 @@
</Style> </Style>
<Style Selector="ListBoxItem /template/ Rectangle#SelectionIndicator"> <Style Selector="ListBoxItem /template/ Rectangle#SelectionIndicator">
<Setter Property="MinHeight" Value="70" /> <Setter Property="MinHeight" Value="70" />
<Setter Property="IsVisible" Value="False" />
</Style>
<Style Selector="ListBoxItem:selected /template/ Rectangle#SelectionIndicator">
<Setter Property="IsVisible" Value="True" />
</Style> </Style>
</ListBox.Styles> </ListBox.Styles>
<ListBox.ItemTemplate> <ListBox.ItemTemplate>

2
src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
View file

@ -50,6 +50,8 @@ namespace Ryujinx.Ava.UI.Views.User
((ContentDialog)_parent.Parent).Title = ((ContentDialog)_parent.Parent).Title =
$"{LocaleManager.Instance[LocaleKeys.UserProfiles_WindowTitle]} - " + $"{LocaleManager.Instance[LocaleKeys.UserProfiles_WindowTitle]} - " +
$"{LocaleManager.Instance[LocaleKeys.UserProfiles_SelectAvatarTitle]}"; $"{LocaleManager.Instance[LocaleKeys.UserProfiles_SelectAvatarTitle]}";
ViewModel.SelectedIndex = -1;
_ = Task.Run(() => _ = Task.Run(() =>
{ {

9
src/Ryujinx/UI/Views/User/UserSelectorView.axaml
View file

@ -19,7 +19,7 @@
<viewModels:UserProfileViewModel /> <viewModels:UserProfileViewModel />
</Design.DataContext> </Design.DataContext>
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto"> <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
<Border BorderThickness="0" Padding="-3"> <Border Padding="-3" BorderThickness="0">
<ListBox <ListBox
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -28,7 +28,10 @@
SelectionChanged="ProfilesList_SelectionChanged"> SelectionChanged="ProfilesList_SelectionChanged">
<ListBox.ItemsPanel> <ListBox.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<UniformGrid Columns="5" /> <WrapPanel
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Horizontal"/>
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ListBox.ItemsPanel> </ListBox.ItemsPanel>
<ListBox.Styles> <ListBox.Styles>
@ -100,7 +103,7 @@
<DataTemplate <DataTemplate
DataType="viewModels:BaseModel"> DataType="viewModels:BaseModel">
<Panel <Panel
Height="120" Height="146"
Width="106"> Width="106">
<Button <Button
MinWidth="50" MinWidth="50"