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

Changed LoadWrapper back to DelayedLoadWrapper and fixed the implementation (dependent on framework change, delay now in ctor)

Browse Source
This commit is contained in:
FreezyLemon 2017-11-22 15:46:04 +01:00
parent 1d41e7cc8a
commit 7d428875b8
6 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
View File

@ -43,16 +43,14 @@ namespace osu.Game.Beatmaps.Drawables
Children = new Drawable[]
{
new LoadWrapper(
new DelayedLoadWrapper(
new PanelBackground(beatmap)
{
RelativeSizeAxes = Axes.Both,
OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
}
)
{
TimeBeforeLoad = 300,
},
},
300
),
new FillFlowContainer
{
Direction = FillDirection.Vertical,

8
osu.Game/Overlays/BeatmapSet/Header.cs
View File

@ -31,7 +31,7 @@ namespace osu.Game.Overlays.BeatmapSet
private readonly AuthorInfo author;
public Details Details;
private LoadWrapper cover;
private DelayedLoadWrapper cover;
public readonly BeatmapPicker Picker;
@ -52,7 +52,7 @@ namespace osu.Game.Overlays.BeatmapSet
videoButtons.FadeTo(BeatmapSet.OnlineInfo.HasVideo ? 1 : 0, transition_duration);
cover?.FadeOut(400, Easing.Out);
coverContainer.Add(cover = new LoadWrapper(
coverContainer.Add(cover = new DelayedLoadWrapper(
new BeatmapSetCover(BeatmapSet)
{
Anchor = Anchor.Centre,
@ -60,10 +60,10 @@ namespace osu.Game.Overlays.BeatmapSet
RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fill,
OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
})
},
300)
{
RelativeSizeAxes = Axes.Both,
TimeBeforeLoad = 300
});
}
}

6
osu.Game/Overlays/Direct/DirectPanel.cs
View File

@ -219,7 +219,7 @@ namespace osu.Game.Overlays.Direct
return icons;
}
protected Drawable CreateBackground() => new LoadWrapper(
protected Drawable CreateBackground() => new DelayedLoadWrapper(
new BeatmapSetCover(SetInfo)
{
Anchor = Anchor.Centre,
@ -231,10 +231,10 @@ namespace osu.Game.Overlays.Direct
d.FadeInFromZero(400, Easing.Out);
BlackBackground.Delay(400).FadeOut();
},
})
},
300)
{
RelativeSizeAxes = Axes.Both,
TimeBeforeLoad = 300
};
public class Statistic : FillFlowContainer

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

@ -99,7 +99,7 @@ namespace osu.Game.Screens.Select.Leaderboards
Padding = new MarginPadding(edge_margin),
Children = new Drawable[]
{
avatar = new LoadWrapper(
avatar = new DelayedLoadWrapper(
new Avatar(Score.User)
{
RelativeSizeAxes = Axes.Both,
@ -112,9 +112,9 @@ namespace osu.Game.Screens.Select.Leaderboards
Radius = 1,
Colour = Color4.Black.Opacity(0.2f),
},
})
},
500)
{
TimeBeforeLoad = 500,
RelativeSizeAxes = Axes.None,
Size = new Vector2(HEIGHT - edge_margin * 2, HEIGHT - edge_margin * 2),
},

5
osu.Game/Users/UpdateableAvatar.cs
View File

@ -40,12 +40,13 @@ namespace osu.Game.Users
{
displayedAvatar?.FadeOut(300);
displayedAvatar?.Expire();
Add(displayedAvatar = new LoadWrapper(
Add(displayedAvatar = new DelayedLoadWrapper(
new Avatar(user)
{
RelativeSizeAxes = Axes.Both,
OnLoadComplete = d => d.FadeInFromZero(200),
})
},
500)
);
}
}

2
osu.Game/Users/UserPanel.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Users
Children = new Drawable[]
{
new LoadWrapper(new UserCoverBackground(user)
new DelayedLoadWrapper(new UserCoverBackground(user)
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre,