h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 20:07:24 +08:00
Code Issues Releases Wiki Activity

Merge branch 'music-controller-improvements' into song-progress-graph

Browse Source 
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
This commit is contained in:
Dean Herbert 2017-04-07 15:49:14 +09:00
commit 06776443eb
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
2 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Overlays/DragBar.cs
View File

@ -17,7 +17,8 @@ namespace osu.Game.Overlays
protected readonly Box Fill;
public Action<float> SeekRequested;
private bool isDragging;
public bool IsSeeking { get; private set; }
private bool enabled = true;
public bool IsEnabled
@ -56,7 +57,7 @@ namespace osu.Game.Overlays
public void UpdatePosition(float position)
{
if (isDragging || !IsEnabled) return;
if (IsSeeking || !IsEnabled) return;
updatePosition(position);
}
@ -72,7 +73,7 @@ namespace osu.Game.Overlays
private void updatePosition(float position)
{
position = MathHelper.Clamp(position, 0, 1);
FillContainer.TransformTo(FillContainer.Width, position, 100, EasingTypes.OutQuint, new TransformWidth());
fill.TransformTo(fill.Width, position, 200, EasingTypes.OutQuint, new TransformSeek());
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@ -87,15 +88,15 @@ namespace osu.Game.Overlays
return true;
}
protected override bool OnDragStart(InputState state) => isDragging = true;
protected override bool OnDragStart(InputState state) => IsSeeking = true;
protected override bool OnDragEnd(InputState state)
{
isDragging = false;
IsSeeking = false;
return true;
}
private class TransformWidth : TransformFloat
private class TransformSeek : TransformFloat
{
public override void Apply(Drawable d)
{

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

@ -46,6 +46,8 @@ namespace osu.Game.Overlays
private Container dragContainer;
private const float progress_height = 10;
private const float bottom_black_area_height = 50;
public MusicController()
@ -117,53 +119,62 @@ namespace osu.Game.Overlays
Text = @"Nothing to play",
Font = @"Exo2.0-BoldItalic"
},
new FillFlowContainer<Button>
{
AutoSizeAxes = Axes.X,
new Container {
Padding = new MarginPadding { Bottom = progress_height },
Height = bottom_black_area_height,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(5),
RelativeSizeAxes = Axes.X,
Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre,
Children = new[]
Children = new Drawable[]
{
new Button
new FillFlowContainer<Button>
{
Action = prev,
Icon = FontAwesome.fa_step_backward,
},
playButton = new Button
{
//Scale = new Vector2(1.4f),
Action = () =>
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(5),
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Children = new[]
{
if (current?.Track == null) return;
if (current.Track.IsRunning)
current.Track.Stop();
else
current.Track.Start();
},
Icon = FontAwesome.fa_play_circle_o,
new Button
{
Action = prev,
Icon = FontAwesome.fa_step_backward,
},
playButton = new Button
{
//Scale = new Vector2(1.3f),
Action = () =>
{
if (current?.Track == null) return;
if (current.Track.IsRunning)
current.Track.Stop();
else
current.Track.Start();
},
Icon = FontAwesome.fa_play_circle_o,
},
new Button
{
Action = next,
Icon = FontAwesome.fa_step_forward,
},
}
},
new Button
{
Action = next,
Icon = FontAwesome.fa_step_forward,
Origin = Anchor.Centre,
Anchor = Anchor.CentreRight,
Position = new Vector2(-bottom_black_area_height / 2, 0),
Icon = FontAwesome.fa_bars,
},
}
},
new Button
{
Origin = Anchor.Centre,
Anchor = Anchor.BottomRight,
Position = new Vector2(-bottom_black_area_height / 2),
Icon = FontAwesome.fa_bars,
},
progress = new DragBar
{
Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre,
Height = 10,
Height = progress_height,
Colour = colours.Yellow,
SeekRequested = seek
}