sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove remaining uses of "child" terminology in non-drawable components

Browse Source
This commit is contained in:
Salman Ahmed
2022-07-26 09:39:30 +03:00
parent d7ef4170be
commit 693ac8750c
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/Select/Carousel/CarouselGroup.cs
View File

@ -7,7 +7,7 @@ using System.Linq;
namespace osu.Game.Screens.Select.Carousel
{
/// <summary>
/// A group which ensures only one child is selected.
/// A group which ensures only one item is selected.
/// </summary>
public class CarouselGroup : CarouselItem
{
@ -18,10 +18,10 @@ namespace osu.Game.Screens.Select.Carousel
private List<CarouselItem> items = new List<CarouselItem>();
/// <summary>
/// Used to assign a monotonically increasing ID to children as they are added. This member is
/// incremented whenever a child is added.
/// Used to assign a monotonically increasing ID to items as they are added. This member is
/// incremented whenever an item is added.
/// </summary>
private ulong currentChildID;
private ulong currentItemID;
private Comparer<CarouselItem>? criteriaComparer;
private Comparer<CarouselItem>? itemIDComparer;
@ -42,7 +42,7 @@ namespace osu.Game.Screens.Select.Carousel
public virtual void AddItem(CarouselItem i)
{
i.State.ValueChanged += state => ChildItemStateChanged(i, state.NewValue);
i.ChildID = ++currentChildID;
i.ItemID = ++currentItemID;
if (lastCriteria != null)
{
@ -91,7 +91,7 @@ namespace osu.Game.Screens.Select.Carousel
// IEnumerable<T>.OrderBy() is used instead of List<T>.Sort() to ensure sorting stability
criteriaComparer = Comparer<CarouselItem>.Create((x, y) => x.CompareTo(criteria, y));
itemIDComparer = Comparer<CarouselItem>.Create((x, y) => x.ChildID.CompareTo(y.ChildID));
itemIDComparer = Comparer<CarouselItem>.Create((x, y) => x.ItemID.CompareTo(y.ItemID));
items = items.OrderBy(c => c, criteriaComparer).ThenBy(c => c, itemIDComparer).ToList();
lastCriteria = criteria;