diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs index b94f9df70c..238abcaf1c 100644 --- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs +++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs @@ -81,15 +81,15 @@ namespace osu.Game.Screens.Select.Leaderboards base.Update(); var fadeStart = scrollContainer.DrawHeight - 10; - fadeStart += scrollContainer.IsScrolledToEnd() ? 70 : 0; + fadeStart += scrollContainer.IsScrolledToEnd() ? LeaderboardScore.HEIGHT : 0; foreach (var s in scrollFlow.Children) { var topY = scrollContainer.ScrollContent.DrawPosition.Y + s.DrawPosition.Y; - var bottomY = topY + 70; + var bottomY = topY + LeaderboardScore.HEIGHT; - s.ColourInfo = ColourInfo.GradientVertical(Color4.White.Opacity(System.Math.Min((fadeStart - topY) / 70, 1)), - Color4.White.Opacity(System.Math.Min((fadeStart - bottomY) / 70, 1))); + s.ColourInfo = ColourInfo.GradientVertical(Color4.White.Opacity(System.Math.Min((fadeStart - topY) / LeaderboardScore.HEIGHT, 1)), + Color4.White.Opacity(System.Math.Min((fadeStart - bottomY) / LeaderboardScore.HEIGHT, 1))); } } } diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs index 2ddebc2437..febf1e76c9 100644 --- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs +++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs @@ -20,7 +20,7 @@ namespace osu.Game.Screens.Select.Leaderboards { public class LeaderboardScore : Container, IStateful { - private const float height = 70; + public static readonly float HEIGHT = 70; private const float corner_radius = 5; private const float edge_margin = 10; private const float background_alpha = 0.25f; @@ -118,7 +118,7 @@ namespace osu.Game.Screens.Select.Leaderboards Rank = rank; RelativeSizeAxes = Axes.X; - Height = height; + Height = HEIGHT; var flag = Score.User?.Region.CreateDrawable() ?? new DrawableFlag(); flag.Width = 30; @@ -171,7 +171,7 @@ namespace osu.Game.Screens.Select.Leaderboards { avatar = new Avatar { - Size = new Vector2(height - edge_margin * 2, height - edge_margin * 2), + Size = new Vector2(HEIGHT - edge_margin * 2, HEIGHT - edge_margin * 2), CornerRadius = corner_radius, Masking = true, EdgeEffect = imageShadow, @@ -181,7 +181,7 @@ namespace osu.Game.Screens.Select.Leaderboards { RelativeSizeAxes = Axes.Y, AutoSizeAxes = Axes.X, - Position = new Vector2(height - edge_margin, 0f), + Position = new Vector2(HEIGHT - edge_margin, 0f), Children = new Drawable[] { nameLabel = new OsuSpriteText