Skip to content

Commit

Permalink
Fix arbitrary game ordering when sorting by Favorites (#7170)
Browse files Browse the repository at this point in the history
* Fix arbitrary sorting by "Favorite" in the UI by making it the same as sorting alphabetically while giving favorites priority.

* Use a more engineered solution rather than string hacks.

* Address code style warnings. Add null checking. Make title name comparison case insensitive.

* one more style fix

---------

Co-authored-by: Logan Stromberg <[email protected]>
  • Loading branch information
lostromb and Logan Stromberg authored Aug 13, 2024
1 parent 4f75e26 commit 23fa5f4
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 2 deletions.
43 changes: 43 additions & 0 deletions src/Ryujinx/UI/ViewModels/AppListFavoriteComparable.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
using Ryujinx.UI.App.Common;
using System;

namespace Ryujinx.Ava.UI.ViewModels
{
/// <summary>
/// Implements a custom comparer which is used for sorting titles by favorite on a UI.
/// Returns a sorted list of favorites in alphabetical order, followed by all non-favorites sorted alphabetical.
/// </summary>
public readonly struct AppListFavoriteComparable : IComparable
{
/// <summary>
/// The application data being compared.
/// </summary>
private readonly ApplicationData app;

/// <summary>
/// Constructs a new <see cref="AppListFavoriteComparable"/> with the specified application data.
/// </summary>
/// <param name="app">The app data being compared.</param>
public AppListFavoriteComparable(ApplicationData app)
{
ArgumentNullException.ThrowIfNull(app, nameof(app));
this.app = app;
}

/// <inheritdoc/>
public readonly int CompareTo(object o)
{
if (o is AppListFavoriteComparable other)
{
if (app.Favorite == other.app.Favorite)
{
return string.Compare(app.Name, other.app.Name, StringComparison.OrdinalIgnoreCase);
}

return app.Favorite ? -1 : 1;
}

throw new InvalidCastException($"Cannot cast {o.GetType()} to {nameof(AppListFavoriteComparable)}");
}
}
}
4 changes: 2 additions & 2 deletions src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -965,8 +965,8 @@ private IComparer<ApplicationData> GetComparer()
: SortExpressionComparer<ApplicationData>.Descending(app => app.FileSize),
ApplicationSort.Path => IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => app.Path)
: SortExpressionComparer<ApplicationData>.Descending(app => app.Path),
ApplicationSort.Favorite => !IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => app.Favorite)
: SortExpressionComparer<ApplicationData>.Descending(app => app.Favorite),
ApplicationSort.Favorite => IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => new AppListFavoriteComparable(app))
: SortExpressionComparer<ApplicationData>.Descending(app => new AppListFavoriteComparable(app)),
_ => null,
#pragma warning restore IDE0055
};
Expand Down

0 comments on commit 23fa5f4

Please sign in to comment.