sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 09:27:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite implementation to avoid duplicated LINQ returns

Browse Source
This commit is contained in:
Dean Herbert 2022-10-25 12:48:17 +09:00
parent b95091fbb0
commit 2456a18bc1
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
View File

@ -115,26 +115,24 @@ namespace osu.Game.Screens.Select.Carousel
protected virtual CarouselItem GetNextToSelect() protected virtual CarouselItem GetNextToSelect()
{ {
int forwardsIndex = lastSelectedIndex; int forwardsIndex = lastSelectedIndex;
bool hasForwards;
int backwardsIndex = lastSelectedIndex; int backwardsIndex = lastSelectedIndex;
bool hasBackwards;
while (true) while ((hasBackwards = backwardsIndex >= 0) | (hasForwards = forwardsIndex < Items.Count))
{ {
// check if a direction has been exhausted and an item (or null) from the other direction should be returned if (hasForwards && !Items[forwardsIndex].Filtered.Value)
if (forwardsIndex >= Items.Count)
return Items.Reverse().Skip(Items.Count - backwardsIndex - 1).FirstOrDefault(item => !item.Filtered.Value);
if (backwardsIndex < 0)
return Items.Skip(forwardsIndex).FirstOrDefault(item => !item.Filtered.Value);
// check if an unfiltered item has been reached
if (!Items[forwardsIndex].Filtered.Value)
return Items[forwardsIndex]; return Items[forwardsIndex];
if (!Items[backwardsIndex].Filtered.Value)
if (hasBackwards && !Items[backwardsIndex].Filtered.Value)
return Items[backwardsIndex]; return Items[backwardsIndex];
// increment the indices
forwardsIndex++; forwardsIndex++;
backwardsIndex--; backwardsIndex--;
} }
return null;
} }
protected virtual void PerformSelection() protected virtual void PerformSelection()