Skip to content

Commit 190ea4d

Browse files
fix: restore RGB colour comparison for TestFruitColourFallback; revert playlist ordering to Position.Y
Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/4c67b1c9-c61b-470a-9c20-6b1e2a261e3d Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
1 parent 9bd0972 commit 190ea4d

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,9 @@ private Drawable setupSkinHierarchy(Drawable child, ISkin skin)
187187

188188
private bool checkLegacyFruitHyperDashColour(DrawableFruit fruit, Colour4 expectedColour) =>
189189
fruit.ChildrenOfType<SkinnableDrawable>().FirstOrDefault()?.Drawable.ChildrenOfType<Sprite>()
190-
.Any(c => c.Colour == expectedColour) == true;
190+
.Any(c => c.Colour.TopLeft.SRGB.R == expectedColour.R
191+
&& c.Colour.TopLeft.SRGB.G == expectedColour.G
192+
&& c.Colour.TopLeft.SRGB.B == expectedColour.B) == true;
191193

192194
private class TestSkin : LegacySkin
193195
{

osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlaylist.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ private void assertItemInQueueListStep(int playlistItemId, int visualIndex)
239239
&& this.ChildrenOfType<MultiplayerQueueList>()
240240
.Single()
241241
.ChildrenOfType<DrawableRoomPlaylistItem>()
242-
.OrderBy(drawable => drawable.Item.PlaylistOrder)
242+
.OrderBy(drawable => drawable.Position.Y)
243243
.TakeWhile(drawable => drawable.Item.ID != playlistItemId)
244244
.Count() == visualIndex;
245245
});

0 commit comments

Comments
 (0)