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

Simplify vertical position calculations by including spacing in height definition

Browse Source
This commit is contained in:
Dean Herbert 2020-10-13 18:13:36 +09:00
parent b1ddb08a4e
commit 69650c16fc
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -775,7 +775,7 @@ namespace osu.Game.Screens.Select
break;
}
scrollTarget += b.TotalHeight + DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
scrollTarget += b.TotalHeight;
}
}

2
osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Screens.Select.Carousel
switch (State.Value)
{
case CarouselItemState.Selected:
return DrawableCarouselBeatmapSet.HEIGHT + Children.Count(c => c.Visible) * (DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING + DrawableCarouselBeatmap.HEIGHT);
return DrawableCarouselBeatmapSet.HEIGHT + Children.Count(c => c.Visible) * DrawableCarouselBeatmap.HEIGHT;
default:
return DrawableCarouselBeatmapSet.HEIGHT;

9
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
View File

@ -33,7 +33,12 @@ namespace osu.Game.Screens.Select.Carousel
{
public const float CAROUSEL_BEATMAP_SPACING = 5;
public const float HEIGHT = MAX_HEIGHT * 0.6f; // TODO: add once base class is fixed + CAROUSEL_BEATMAP_SPACING;
/// <summary>
/// The height of a carousel beatmap, including vertical spacing.
/// </summary>
public const float HEIGHT = height + CAROUSEL_BEATMAP_SPACING;
private const float height = MAX_HEIGHT * 0.6f;
private readonly BeatmapInfo beatmap;
@ -70,7 +75,7 @@ namespace osu.Game.Screens.Select.Carousel
[BackgroundDependencyLoader(true)]
private void load(BeatmapManager manager, SongSelect songSelect)
{
Header.Height = HEIGHT;
Header.Height = height;
if (songSelect != null)
{

2
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
View File

@ -175,7 +175,7 @@ namespace osu.Game.Screens.Select.Carousel
foreach (var panel in beatmapContainer.Children)
{
panel.MoveToY(yPos, 800, Easing.OutQuint);
yPos += panel.Item.TotalHeight + DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
yPos += panel.Item.TotalHeight;
}
}
}