h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-14 00:53:19 +08:00
Code Issues Releases Wiki Activity

Simplify sorting logic

Browse Source
This commit is contained in:
Andrei Zavatski 2019-08-27 05:03:47 +03:00
parent 385bc6f529
commit 9223a1ba8a
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Overlays/SocialOverlay.cs
View File

@ -16,6 +16,7 @@ using osu.Game.Overlays.SearchableList;
using osu.Game.Overlays.Social;
using osu.Game.Users;
using osu.Framework.Threading;
using System;
namespace osu.Game.Overlays
{
@ -188,31 +189,11 @@ namespace osu.Game.Overlays
switch (Filter.Tabs.Current.Value)
{
case SocialSortCriteria.Location:
switch (sortDirection)
{
case SortDirection.Ascending:
sortedUsers = sortedUsers.OrderBy(u => u.Country.FullName);
break;
case SortDirection.Descending:
sortedUsers = sortedUsers.OrderByDescending(u => u.Country.FullName);
break;
}
sortedUsers = sortBy(sortedUsers, u => u.Country.FullName, sortDirection);
break;
case SocialSortCriteria.Name:
switch (sortDirection)
{
case SortDirection.Ascending:
sortedUsers = sortedUsers.OrderBy(u => u.Username);
break;
case SortDirection.Descending:
sortedUsers = sortedUsers.OrderByDescending(u => u.Username);
break;
}
sortedUsers = sortBy(sortedUsers, u => u.Username, sortDirection);
break;
}
}
@ -221,6 +202,9 @@ namespace osu.Game.Overlays
recreatePanels(Filter.DisplayStyleControl.DisplayStyle.Value);
}
private IEnumerable<User> sortBy<T>(IEnumerable<User> users, Func<User, T> condition, SortDirection sortDirection) =>
sortDirection == SortDirection.Ascending ? users.OrderBy(condition) : users.OrderByDescending(condition);
private void onDropdownChanged()
{
if (Users == null)