mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-12-29 10:11:22 -08:00
934b5a64e5
* Fix redundancies * Add back elses * Loading Screen fixes * Redesign User Profile Manager - Backported long selection bar in Grid/List view not working - Backported UserSelector is jank * Fix SelectionIndicator * Fix DataType * Fix SaveManager bug * Remove debug log * Load saves on UIThread * Reduce UI thread blocking * Fix locale keys * Use block namespaces * Fix close button width * Make UserProfile ordering consistent * Alphabetical order * Adjust layout, remove green circle for blue selector * Fix some inconsistencies * Fix no inital selected profile * Adjust appearance of edit button * Adjust SaveManager * Remove redundant warning dialog * Make firmware avatar selector clearer * View redesign again :hero_depressed: * Consistency adjustments * Adjust margins * Make `UserProfileImageSelector` consistent * Make `UserFirmwareAvatarSelector` consistent * Fix long grid view selector * Switch case * Remove long selection bar Handled in #4178 * Consistency * Started dialog titles * Fixes * Remaining titles * Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml Co-authored-by: Mary-nyan <thog@protonmail.com> * Fix build * Hide UserRecoverer if no LostProfiles are found * UserEditor Avatar Placeholder * Watermark + locale adjustment * Border radius * Remove unnecessary styles * Fix firmware avatar image order * Cleanup `ColorPickerButton` * Make `UserId` copy/paste able * Make `FirmwareAvatarSelector` 6 images wide * Make selection bar better * Unsaved changes dialogue * Fix indentation * Remove extra check * Address suggestions * Reorganise - Remove unused views - Rename views to match convention - Fix weird namespacing * Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml Co-authored-by: Ac_K <Acoustik666@gmail.com> * UserRecovererView empty placeholder * Update Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserRecovererView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Models/UserProfile.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Remove AddModel * Update Ryujinx.Ava/Assets/Locales/en_US.json Co-authored-by: Ac_K <Acoustik666@gmail.com> * Fix bug Co-authored-by: Mary-nyan <thog@protonmail.com> Co-authored-by: Ac_K <Acoustik666@gmail.com>
114 lines
4.3 KiB
XML
114 lines
4.3 KiB
XML
<UserControl
|
|
xmlns="https://github.com/avaloniaui"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
mc:Ignorable="d"
|
|
Width="528"
|
|
d:DesignWidth="578"
|
|
d:DesignHeight="350"
|
|
x:Class="Ryujinx.Ava.UI.Views.User.UserFirmwareAvatarSelectorView"
|
|
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
|
|
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
|
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
|
x:CompileBindings="True"
|
|
x:DataType="viewModels:UserFirmwareAvatarSelectorViewModel"
|
|
Focusable="True">
|
|
<Design.DataContext>
|
|
<viewModels:UserFirmwareAvatarSelectorViewModel />
|
|
</Design.DataContext>
|
|
<UserControl.Resources>
|
|
<helpers:BitmapArrayValueConverter x:Key="ByteImage" />
|
|
</UserControl.Resources>
|
|
<Grid
|
|
Margin="0"
|
|
HorizontalAlignment="Stretch"
|
|
VerticalAlignment="Stretch">
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="Auto" />
|
|
<RowDefinition Height="*" />
|
|
<RowDefinition Height="Auto" />
|
|
<RowDefinition Height="Auto" />
|
|
</Grid.RowDefinitions>
|
|
<ListBox
|
|
Grid.Row="1"
|
|
BorderThickness="0"
|
|
SelectedIndex="{Binding SelectedIndex}"
|
|
Height="400"
|
|
Items="{Binding Images}"
|
|
HorizontalAlignment="Stretch"
|
|
VerticalAlignment="Center">
|
|
<ListBox.ItemsPanel>
|
|
<ItemsPanelTemplate>
|
|
<WrapPanel
|
|
Orientation="Horizontal"
|
|
Margin="0"
|
|
HorizontalAlignment="Center" />
|
|
</ItemsPanelTemplate>
|
|
</ListBox.ItemsPanel>
|
|
<ListBox.Styles>
|
|
<Style Selector="ListBoxItem">
|
|
<Setter Property="CornerRadius" Value="4" />
|
|
<Setter Property="Width" Value="85" />
|
|
<Setter Property="MaxWidth" Value="85" />
|
|
<Setter Property="MinWidth" Value="85" />
|
|
</Style>
|
|
<Style Selector="ListBoxItem /template/ Border#SelectionIndicator">
|
|
<Setter Property="MinHeight" Value="70" />
|
|
</Style>
|
|
</ListBox.Styles>
|
|
<ListBox.ItemTemplate>
|
|
<DataTemplate>
|
|
<Panel
|
|
Background="{Binding BackgroundColor}"
|
|
Margin="5">
|
|
<Image Source="{Binding Data, Converter={StaticResource ByteImage}}" />
|
|
</Panel>
|
|
</DataTemplate>
|
|
</ListBox.ItemTemplate>
|
|
</ListBox>
|
|
<StackPanel
|
|
Grid.Row="3"
|
|
Orientation="Horizontal"
|
|
Spacing="10"
|
|
Margin="0 24 0 0"
|
|
HorizontalAlignment="Left">
|
|
<Button
|
|
Width="50"
|
|
MinWidth="50"
|
|
Height="35"
|
|
Click="GoBack">
|
|
<ui:SymbolIcon Symbol="Back" />
|
|
</Button>
|
|
</StackPanel>
|
|
<StackPanel
|
|
Grid.Row="3"
|
|
Orientation="Horizontal"
|
|
Spacing="10"
|
|
Margin="0 24 0 0"
|
|
HorizontalAlignment="Right">
|
|
<ui:ColorPickerButton
|
|
FlyoutPlacement="Top"
|
|
IsMoreButtonVisible="False"
|
|
UseColorPalette="False"
|
|
UseColorTriangle="False"
|
|
UseColorWheel="False"
|
|
ShowAcceptDismissButtons="False"
|
|
IsAlphaEnabled="False"
|
|
Color="{Binding BackgroundColor, Mode=TwoWay}"
|
|
Name="ColorButton">
|
|
<ui:ColorPickerButton.Styles>
|
|
<Style Selector="Grid#Root > DockPanel > Grid">
|
|
<Setter Property="IsVisible" Value="False" />
|
|
</Style>
|
|
</ui:ColorPickerButton.Styles>
|
|
</ui:ColorPickerButton>
|
|
<Button
|
|
Content="{locale:Locale AvatarChoose}"
|
|
Height="35"
|
|
Name="ChooseButton"
|
|
Click="ChooseButton_OnClick" />
|
|
</StackPanel>
|
|
</Grid>
|
|
</UserControl> |