h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 09:22:54 +08:00
Code Issues Releases Wiki Activity

Use LeaderboardScore height for fade

Browse Source
This commit is contained in:
DrabWeb 2017-03-17 19:07:45 -03:00
parent 82c02fa1fc
commit 137611ecf3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View File

@ -81,15 +81,15 @@ namespace osu.Game.Screens.Select.Leaderboards
base.Update(); base.Update();
var fadeStart = scrollContainer.DrawHeight - 10; var fadeStart = scrollContainer.DrawHeight - 10;
fadeStart += scrollContainer.IsScrolledToEnd() ? 70 : 0; fadeStart += scrollContainer.IsScrolledToEnd() ? LeaderboardScore.HEIGHT : 0;
foreach (var s in scrollFlow.Children) foreach (var s in scrollFlow.Children)
{ {
var topY = scrollContainer.ScrollContent.DrawPosition.Y + s.DrawPosition.Y; 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)), s.ColourInfo = ColourInfo.GradientVertical(Color4.White.Opacity(System.Math.Min((fadeStart - topY) / LeaderboardScore.HEIGHT, 1)),
Color4.White.Opacity(System.Math.Min((fadeStart - bottomY) / 70, 1))); Color4.White.Opacity(System.Math.Min((fadeStart - bottomY) / LeaderboardScore.HEIGHT, 1)));
} }
} }
} }

8
osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Screens.Select.Leaderboards
{ {
public class LeaderboardScore : Container, IStateful<Visibility> public class LeaderboardScore : Container, IStateful<Visibility>
{ {
private const float height = 70; public static readonly float HEIGHT = 70;
private const float corner_radius = 5; private const float corner_radius = 5;
private const float edge_margin = 10; private const float edge_margin = 10;
private const float background_alpha = 0.25f; private const float background_alpha = 0.25f;
@ -118,7 +118,7 @@ namespace osu.Game.Screens.Select.Leaderboards
Rank = rank; Rank = rank;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Height = height; Height = HEIGHT;
var flag = Score.User?.Region.CreateDrawable() ?? new DrawableFlag(); var flag = Score.User?.Region.CreateDrawable() ?? new DrawableFlag();
flag.Width = 30; flag.Width = 30;
@ -171,7 +171,7 @@ namespace osu.Game.Screens.Select.Leaderboards
{ {
avatar = new Avatar 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, CornerRadius = corner_radius,
Masking = true, Masking = true,
EdgeEffect = imageShadow, EdgeEffect = imageShadow,
@ -181,7 +181,7 @@ namespace osu.Game.Screens.Select.Leaderboards
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Position = new Vector2(height - edge_margin, 0f), Position = new Vector2(HEIGHT - edge_margin, 0f),
Children = new Drawable[] Children = new Drawable[]
{ {
nameLabel = new OsuSpriteText nameLabel = new OsuSpriteText