h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 15:47:26 +08:00
Code Issues Releases Wiki Activity

Button behavior fixes.

Browse Source
This commit is contained in:
Huo Yaoyuan 2016-10-24 17:19:48 +08:00
parent a32f9eed51
commit 1a3a5c544d
1 changed files with 62 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
osu.Game/Overlays/MusicController.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Overlays
{ {
private Sprite backgroundSprite; private Sprite backgroundSprite;
private Box progress; private Box progress;
private ClickableTextAwesome playButton, listButton; private TextAwesome playButton, listButton;
private SpriteText title, artist; private SpriteText title, artist;
private OsuGameBase osuGame; private OsuGameBase osuGame;
private List<BeatmapSetInfo> playList; private List<BeatmapSetInfo> playList;
@ -75,10 +75,9 @@ namespace osu.Game.Overlays
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Colour = new Color4(0, 0, 0, 127) Colour = new Color4(0, 0, 0, 127)
}, },
playButton = new ClickableTextAwesome new ClickableContainer
{ {
TextSize = 30, AutoSizeAxes = Axes.Both,
Icon = FontAwesome.play_circle_o,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Position = new Vector2(0, 30), Position = new Vector2(0, 30),
@ -95,33 +94,70 @@ namespace osu.Game.Overlays
currentTrack.Start(); currentTrack.Start();
playButton.Icon = FontAwesome.pause; playButton.Icon = FontAwesome.pause;
} }
},
Children = new Drawable[]
{
playButton = new TextAwesome
{
TextSize = 30,
Icon = FontAwesome.play_circle_o,
Origin = Anchor.Centre,
Anchor = Anchor.Centre
}
} }
}, },
new ClickableTextAwesome new ClickableContainer
{ {
TextSize = 15, AutoSizeAxes = Axes.Both,
Icon = FontAwesome.step_backward,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Position = new Vector2(-30, 30), Position = new Vector2(-30, 30),
Action = prev Action = prev,
Children = new Drawable[]
{
new TextAwesome
{
TextSize = 15,
Icon = FontAwesome.step_backward,
Origin = Anchor.Centre,
Anchor = Anchor.Centre
}
}
}, },
new ClickableTextAwesome new ClickableContainer
{ {
TextSize = 15, AutoSizeAxes = Axes.Both,
Icon = FontAwesome.step_forward,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Position = new Vector2(30, 30), Position = new Vector2(30, 30),
Action = next Action = next,
Children = new Drawable[]
{
new TextAwesome
{
TextSize = 15,
Icon = FontAwesome.step_forward,
Origin = Anchor.Centre,
Anchor = Anchor.Centre
}
}
}, },
listButton = new ClickableTextAwesome new ClickableContainer
{ {
TextSize = 15, AutoSizeAxes = Axes.Both,
Icon = FontAwesome.bars,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.BottomRight, Anchor = Anchor.BottomRight,
Position = new Vector2(20, 30) Position = new Vector2(20, 30),
Children = new Drawable[]
{
listButton = new TextAwesome
{
TextSize = 15,
Icon = FontAwesome.bars,
Origin = Anchor.Centre,
Anchor = Anchor.Centre
}
}
}, },
progress = new Box progress = new Box
{ {
@ -133,7 +169,11 @@ namespace osu.Game.Overlays
Colour = Color4.Orange Colour = Color4.Orange
} }
}; };
if (currentPlay != null) play(currentPlay, null); if (currentPlay != null)
{
playButton.Icon=FontAwesome.pause;
play(currentPlay, null);
}
} }
private void prev() private void prev()
@ -156,13 +196,14 @@ namespace osu.Game.Overlays
private void play(BeatmapSetInfo beatmap, bool? isNext) private void play(BeatmapSetInfo beatmap, bool? isNext)
{ {
title.Text = beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title; BeatmapMetadata metadata = osuGame.Beatmaps.Query<BeatmapMetadata>().Where(x => x.ID == beatmap.BeatmapMetadataID).First();
artist.Text = beatmap.Metadata.ArtistUnicode ?? beatmap.Metadata.Artist; title.Text = metadata.TitleUnicode ?? metadata.Title;
artist.Text = metadata.ArtistUnicode ?? metadata.Artist;
ArchiveReader reader = osuGame.Beatmaps.GetReader(currentPlay); ArchiveReader reader = osuGame.Beatmaps.GetReader(currentPlay);
currentTrack?.Stop(); currentTrack?.Stop();
currentTrack = new AudioTrackBass(reader.ReadFile(beatmap.Metadata.AudioFile)); currentTrack = new AudioTrackBass(reader.ReadFile(metadata.AudioFile));
currentTrack.Start(); currentTrack.Start();
Sprite newBackground = getScaledSprite(TextureLoader.FromStream(reader.ReadFile(beatmap.Metadata.BackgroundFile))); Sprite newBackground = getScaledSprite(TextureLoader.FromStream(reader.ReadFile(metadata.BackgroundFile)));
Add(newBackground); Add(newBackground);
if (isNext == true) if (isNext == true)
{ {