RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better structure for button layout.

This commit is contained in:
Dean Herbert 2017-04-07 15:28:18 +09:00
parent 7d2af9310b
commit 2c2a4169c6
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
1 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,8 @@ public class MusicController : FocusedOverlayContainer
private Container dragContainer; private Container dragContainer;
private const float progress_height = 10;
private const float bottom_black_area_height = 50; private const float bottom_black_area_height = 50;
public MusicController() public MusicController()
@ -117,53 +119,62 @@ private void load(OsuGameBase game, OsuConfigManager config, BeatmapDatabase bea
Text = @"Nothing to play", Text = @"Nothing to play",
Font = @"Exo2.0-BoldItalic" Font = @"Exo2.0-BoldItalic"
}, },
new FillFlowContainer<Button> new Container {
{ Padding = new MarginPadding { Bottom = progress_height },
AutoSizeAxes = Axes.X,
Height = bottom_black_area_height, Height = bottom_black_area_height,
Direction = FillDirection.Horizontal, RelativeSizeAxes = Axes.X,
Spacing = new Vector2(5),
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Children = new[] Children = new Drawable[]
{ {
new Button new FillFlowContainer<Button>
{ {
Action = prev, AutoSizeAxes = Axes.Both,
Icon = FontAwesome.fa_step_backward, Direction = FillDirection.Horizontal,
}, Spacing = new Vector2(5),
playButton = new Button Origin = Anchor.Centre,
{ Anchor = Anchor.Centre,
//Scale = new Vector2(1.4f), Children = new[]
Action = () =>
{ {
if (current?.Track == null) return; new Button
if (current.Track.IsRunning) {
current.Track.Stop(); Action = prev,
else Icon = FontAwesome.fa_step_backward,
current.Track.Start(); },
}, playButton = new Button
Icon = FontAwesome.fa_play_circle_o, {
//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 new Button
{ {
Action = next, Origin = Anchor.Centre,
Icon = FontAwesome.fa_step_forward, 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 progress = new DragBar
{ {
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Height = 10, Height = progress_height,
Colour = colours.Yellow, Colour = colours.Yellow,
SeekRequested = seek SeekRequested = seek
} }