forked from emmauss/Ryujinx
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix arbitrary game ordering when sorting by Favorites (#7170)
* 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
Showing
2 changed files
with
45 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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)}"); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters