Reverts & Some Fixes

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

View file

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

View file

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

View file

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

View file

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