h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 10:33:30 +08:00
Code Issues Releases Wiki Activity

Merge pull request #28601 from peppy/adjust-carousel-panel-spacing

Browse Source 
Adjust beatmap carousel's spacing to remove dead-space
This commit is contained in:
Dan Balasescu 2024-06-26 15:35:52 +09:00 committed by GitHub
commit 173c4f430a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -1000,8 +1000,6 @@ namespace osu.Game.Screens.Select
return set;
}
private const float panel_padding = 5;
/// <summary>
/// Computes the target Y positions for every item in the carousel.
/// </summary>
@ -1023,10 +1021,18 @@ namespace osu.Game.Screens.Select
{
case CarouselBeatmapSet set:
{
bool isSelected = item.State.Value == CarouselItemState.Selected;
float padding = isSelected ? 5 : -5;
if (isSelected)
// double padding because we want to cancel the negative padding from the last item.
currentY += padding * 2;
visibleItems.Add(set);
set.CarouselYPosition = currentY;
if (item.State.Value == CarouselItemState.Selected)
if (isSelected)
{
// scroll position at currentY makes the set panel appear at the very top of the carousel's screen space
// move down by half of visible height (height of the carousel's visible extent, including semi-transparent areas)
@ -1048,7 +1054,7 @@ namespace osu.Game.Screens.Select
}
}
currentY += set.TotalHeight + panel_padding;
currentY += set.TotalHeight + padding;
break;
}
}

4
osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
View File

@ -144,9 +144,9 @@ namespace osu.Game.Screens.Select.Carousel
}
if (!Item.Visible)
this.FadeOut(300, Easing.OutQuint);
this.FadeOut(100, Easing.OutQuint);
else
this.FadeIn(250);
this.FadeIn(400, Easing.OutQuint);
}
protected virtual void Selected()