mirror of
https://git.naxdy.org/Mirror/Ryujinx.git
synced 2025-03-14 22:40:18 +00:00
Make UserProfile ordering consistent
This commit is contained in:
parent
151908f9dc
commit
1acfa338d8
3 changed files with 6 additions and 33 deletions
|
@ -113,25 +113,13 @@ namespace Ryujinx.Ava.UI.Controls
|
||||||
ViewModel.Profiles.Clear();
|
ViewModel.Profiles.Clear();
|
||||||
ViewModel.LostProfiles.Clear();
|
ViewModel.LostProfiles.Clear();
|
||||||
|
|
||||||
var profiles = AccountManager.GetAllUsers().OrderByDescending(x => x.AccountState == AccountState.Open);
|
var profiles = AccountManager.GetAllUsers();
|
||||||
|
|
||||||
foreach (var profile in profiles)
|
foreach (var profile in profiles)
|
||||||
{
|
{
|
||||||
ViewModel.Profiles.Add(new UserProfile(profile, this));
|
ViewModel.Profiles.Add(new UserProfile(profile, this));
|
||||||
}
|
}
|
||||||
|
|
||||||
ViewModel.SelectedProfile = ViewModel.Profiles.Cast<UserProfile>().FirstOrDefault(x => x.UserId == AccountManager.LastOpenedUser.UserId);
|
|
||||||
|
|
||||||
if (ViewModel.SelectedProfile == null)
|
|
||||||
{
|
|
||||||
ViewModel.SelectedProfile = (UserProfile)ViewModel.Profiles.First();
|
|
||||||
|
|
||||||
if (ViewModel.SelectedProfile != null)
|
|
||||||
{
|
|
||||||
AccountManager.OpenUser(ViewModel.SelectedProfile.UserId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var saveDataFilter = SaveDataFilter.Make(programId: default, saveType: SaveDataType.Account,
|
var saveDataFilter = SaveDataFilter.Make(programId: default, saveType: SaveDataType.Account,
|
||||||
default, saveDataId: default, index: default);
|
default, saveDataId: default, index: default);
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,6 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||||
{
|
{
|
||||||
public class UserProfileViewModel : BaseModel, IDisposable
|
public class UserProfileViewModel : BaseModel, IDisposable
|
||||||
{
|
{
|
||||||
private UserProfile _selectedProfile;
|
|
||||||
|
|
||||||
public UserProfileViewModel()
|
public UserProfileViewModel()
|
||||||
{
|
{
|
||||||
Profiles = new ObservableCollection<BaseModel>();
|
Profiles = new ObservableCollection<BaseModel>();
|
||||||
|
@ -18,17 +16,6 @@ namespace Ryujinx.Ava.UI.ViewModels
|
||||||
|
|
||||||
public ObservableCollection<UserProfile> LostProfiles { get; set; }
|
public ObservableCollection<UserProfile> LostProfiles { get; set; }
|
||||||
|
|
||||||
public UserProfile SelectedProfile
|
|
||||||
{
|
|
||||||
get => _selectedProfile;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_selectedProfile = value;
|
|
||||||
|
|
||||||
OnPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose() { }
|
public void Dispose() { }
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -73,9 +73,7 @@ namespace Ryujinx.Ava.UI.Views.User
|
||||||
{
|
{
|
||||||
if (ViewModel.Profiles[selectedIndex] is UserProfile userProfile)
|
if (ViewModel.Profiles[selectedIndex] is UserProfile userProfile)
|
||||||
{
|
{
|
||||||
ViewModel.SelectedProfile = userProfile;
|
_parent?.AccountManager?.OpenUser(userProfile.UserId);
|
||||||
|
|
||||||
_parent?.AccountManager?.OpenUser(ViewModel.SelectedProfile.UserId);
|
|
||||||
|
|
||||||
foreach (BaseModel profile in ViewModel.Profiles)
|
foreach (BaseModel profile in ViewModel.Profiles)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue