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

Update MusicController using DragBar.

Browse Source
This commit is contained in:
Huo Yaoyuan 2016-10-27 18:15:43 +08:00
parent 35b1d0ae50
commit 73d1eeb272
1 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,6 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Input;
using osu.Game.Beatmaps.IO;
using osu.Game.Database;
using osu.Game.Graphics;
@ -23,9 +22,10 @@ namespace osu.Game.Overlays
public class MusicController : OverlayContainer
{
private Sprite backgroundSprite;
private Box progress;
private DragBar progress;
private TextAwesome playButton, listButton;
private SpriteText title, artist;
private OsuGameBase osuGame;
private List<BeatmapSetInfo> playList;
private BeatmapDatabase database;
@ -170,14 +170,13 @@ namespace osu.Game.Overlays
}
}
},
progress = new Box
progress = new DragBar
{
RelativeSizeAxes = Axes.X,
Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre,
Height = 10,
Width = 0,
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
Colour = Color4.Orange
Colour = Color4.Orange,
SeekRequested = seek
}
};
@ -192,7 +191,7 @@ namespace osu.Game.Overlays
{
base.Update();
if (CurrentTrack == null) return;
progress.Width = (float)(CurrentTrack.CurrentTime / CurrentTrack.Length);
progress.UpdatePosition((float)(CurrentTrack.CurrentTime / CurrentTrack.Length));
if (CurrentTrack.HasCompleted) next();
}
@ -267,27 +266,7 @@ namespace osu.Game.Overlays
return scaledSprite;
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{
trySeek(state);
return base.OnMouseDown(state, args);
}
protected override bool OnMouseMove(InputState state)
{
trySeek(state);
return base.OnMouseMove(state);
}
private void trySeek(InputState state)
{
if (state.Mouse.LeftButton)
{
Vector2 pos = GetLocalPosition(state.Mouse.NativeState.Position);
if (pos.Y > 120)
CurrentTrack?.Seek(CurrentTrack.Length * pos.X / 400f);
}
}
private void seek(float position) => CurrentTrack?.Seek(CurrentTrack.Length * position);
//placeholder for toggling
protected override void PopIn() => FadeIn(500);