sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 09:57:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix unfixed regressions

Browse Source
This commit is contained in:
Dean Herbert 2017-11-23 20:23:47 +09:00
parent 6d88396139
commit 9db6ef6657
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Direct/PlayButton.cs
View File

@ -152,7 +152,7 @@ namespace osu.Game.Overlays.Direct
// We may have been replaced by another loader // We may have been replaced by another loader
if (trackLoader != d) return; if (trackLoader != d) return;
Preview = (d as TrackLoader)?.Preview; Preview = d?.Preview;
Playing.TriggerChange(); Playing.TriggerChange();
loading = false; loading = false;
Add(trackLoader); Add(trackLoader);

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

@ -33,7 +33,7 @@ namespace osu.Game.Screens.Select.Leaderboards
private Box background; private Box background;
private Container content; private Container content;
private Container avatar; private Drawable avatar;
private DrawableRank scoreRank; private DrawableRank scoreRank;
private OsuSpriteText nameLabel; private OsuSpriteText nameLabel;
private GlowingSpriteText scoreLabel; private GlowingSpriteText scoreLabel;
@ -97,7 +97,7 @@ namespace osu.Game.Screens.Select.Leaderboards
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding(edge_margin), Padding = new MarginPadding(edge_margin),
Children = new Drawable[] Children = new[]
{ {
avatar = new DelayedLoadWrapper( avatar = new DelayedLoadWrapper(
new Avatar(Score.User) new Avatar(Score.User)
@ -112,7 +112,7 @@ namespace osu.Game.Screens.Select.Leaderboards
Radius = 1, Radius = 1,
Colour = Color4.Black.Opacity(0.2f), Colour = Color4.Black.Opacity(0.2f),
}, },
}, 500) })
{ {
RelativeSizeAxes = Axes.None, RelativeSizeAxes = Axes.None,
Size = new Vector2(HEIGHT - edge_margin * 2, HEIGHT - edge_margin * 2), Size = new Vector2(HEIGHT - edge_margin * 2, HEIGHT - edge_margin * 2),
@ -210,7 +210,7 @@ namespace osu.Game.Screens.Select.Leaderboards
public override void Show() public override void Show()
{ {
foreach (var d in new Drawable[] { avatar, nameLabel, scoreLabel, scoreRank, flagBadgeContainer, maxCombo, accuracy, modsContainer }) foreach (var d in new[] { avatar, nameLabel, scoreLabel, scoreRank, flagBadgeContainer, maxCombo, accuracy, modsContainer })
d.FadeOut(); d.FadeOut();
Alpha = 0; Alpha = 0;

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

@ -11,7 +11,7 @@ namespace osu.Game.Users
/// </summary> /// </summary>
public class UpdateableAvatar : Container public class UpdateableAvatar : Container
{ {
private Container displayedAvatar; private Drawable displayedAvatar;
private User user; private User user;
@ -45,7 +45,7 @@ namespace osu.Game.Users
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
OnLoadComplete = d => d.FadeInFromZero(200), OnLoadComplete = d => d.FadeInFromZero(200),
}, 500) })
); );
} }
} }