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

Small fixes and style corrections

Browse Source
This commit is contained in:
FreezyLemon 2017-11-21 19:16:44 +01:00
parent fd7ac9b6fc
commit 2203a84300
5 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,17 +52,18 @@ namespace osu.Game.Overlays.BeatmapSet
videoButtons.FadeTo(BeatmapSet.OnlineInfo.HasVideo ? 1 : 0, transition_duration); videoButtons.FadeTo(BeatmapSet.OnlineInfo.HasVideo ? 1 : 0, transition_duration);
cover?.FadeOut(400, Easing.Out); cover?.FadeOut(400, Easing.Out);
coverContainer.Add(cover = new LoadWrapper(new BeatmapSetCover(BeatmapSet) coverContainer.Add(cover = new LoadWrapper(
{ new BeatmapSetCover(BeatmapSet)
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fill,
OnLoadComplete = d =>
{ {
d.FadeInFromZero(400, Easing.Out); Anchor = Anchor.Centre,
}, Origin = Anchor.Centre,
}) RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fill,
OnLoadComplete = d =>
{
d.FadeInFromZero(400, Easing.Out);
},
})
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
TimeBeforeLoad = 300 TimeBeforeLoad = 300

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

@ -219,18 +219,19 @@ namespace osu.Game.Overlays.Direct
return icons; return icons;
} }
protected Drawable CreateBackground() => new LoadWrapper(new BeatmapSetCover(SetInfo) protected Drawable CreateBackground() => new LoadWrapper(
{ new BeatmapSetCover(SetInfo)
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fill,
OnLoadComplete = d =>
{ {
d.FadeInFromZero(400, Easing.Out); Anchor = Anchor.Centre,
BlackBackground.Delay(400).FadeOut(); Origin = Anchor.Centre,
}, RelativeSizeAxes = Axes.Both,
}) FillMode = FillMode.Fill,
OnLoadComplete = d =>
{
d.FadeInFromZero(400, Easing.Out);
BlackBackground.Delay(400).FadeOut();
},
})
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
TimeBeforeLoad = 300 TimeBeforeLoad = 300

7
osu.Game/Screens/Multiplayer/DrawableRoom.cs
View File

@ -229,6 +229,7 @@ namespace osu.Game.Screens.Multiplayer
{ {
coverContainer.FadeIn(transition_duration); coverContainer.FadeIn(transition_duration);
LoadComponentAsync(new BeatmapSetCover(value.BeatmapSet) LoadComponentAsync(new BeatmapSetCover(value.BeatmapSet)
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -236,11 +237,7 @@ namespace osu.Game.Screens.Multiplayer
FillMode = FillMode.Fill, FillMode = FillMode.Fill,
OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out), OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
}, },
bsc => bsc => coverContainer.Add(bsc));
{
bsc.RelativeSizeAxes = Axes.Both;
coverContainer.Add(bsc);
});
beatmapTitle.Current = localisation.GetUnicodePreference(value.Metadata.TitleUnicode, value.Metadata.Title); beatmapTitle.Current = localisation.GetUnicodePreference(value.Metadata.TitleUnicode, value.Metadata.Title);
beatmapDash.Text = @" - "; beatmapDash.Text = @" - ";

6
osu.Game/Screens/Multiplayer/RoomInspector.cs
View File

@ -338,11 +338,7 @@ namespace osu.Game.Screens.Multiplayer
FillMode = FillMode.Fill, FillMode = FillMode.Fill,
OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out), OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
}, },
bsc => bsc => coverContainer.Add(bsc));
{
bsc.RelativeSizeAxes = Axes.Both;
coverContainer.Add(bsc);
});
beatmapTitle.Current = localisation.GetUnicodePreference(value.Metadata.TitleUnicode, value.Metadata.Title); beatmapTitle.Current = localisation.GetUnicodePreference(value.Metadata.TitleUnicode, value.Metadata.Title);
beatmapDash.Text = @" - "; beatmapDash.Text = @" - ";

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

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