sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Removed gradient from test case, modified DragBar to allow access to what's needed in the progress bar, styled the progress bar

Browse Source
This commit is contained in:
DrabWeb
2017-02-09 16:28:40 -04:00
parent 50f93bc215
commit 7fea233181
6 changed files with 86 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
osu.Game/Screens/Play/SongProgress.cs
View File

@ -16,9 +16,8 @@ namespace osu.Game.Screens.Play
{
public class SongProgress : Container
{
private const int graph_height = 34;
private const int handle_height = 25;
private const int handle_width = 14;
public static readonly int BAR_HEIGHT = 5;
public static readonly int GRAPH_HEIGHT = 34;
public static readonly Color4 FILL_COLOUR = new Color4(221, 255, 255, 255);
public static readonly Color4 GLOW_COLOUR = new Color4(221, 255, 255, 150);
@ -40,15 +39,20 @@ namespace osu.Game.Screens.Play
{
float currentProgress = (float)(current.Track.CurrentTime / current.Track.Length);
progress.IsEnabled = true;
progress.UpdatePosition(currentProgress);
graph.Progress = (int)(graph.ColumnCount * currentProgress);
}
else
{
progress.IsEnabled = false;
}
}
public SongProgress()
{
RelativeSizeAxes = Axes.X;
Height = SongProgressBar.BAR_HEIGHT + graph_height + handle_height;
Height = BAR_HEIGHT + GRAPH_HEIGHT + SongProgressBar.HANDLE_SIZE.Y;
Children = new Drawable[]
{
@ -57,56 +61,22 @@ namespace osu.Game.Screens.Play
RelativeSizeAxes = Axes.X,
Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre,
Height = graph_height,
Height = GRAPH_HEIGHT,
Margin = new MarginPadding
{
Bottom = SongProgressBar.BAR_HEIGHT
Bottom = BAR_HEIGHT
}
},
progress = new SongProgressBar
{
Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre,
IsEnabled = true,
SeekRequested = delegate (float position)
{
Framework.Logging.Logger.Log($@"Seeked to {position}");
current?.Track?.Seek(current.Track.Length * position);
current?.Track?.Start();
}
}
//handle = new Container
// {
// Origin = Anchor.BottomLeft,
// Anchor = Anchor.BottomLeft,
// Width = 2,
// Height = bar_height + graph_height,
// Position = new Vector2(2, 0),
// Children = new Drawable[]
// {
// new Box
// {
// RelativeSizeAxes = Axes.Both,
// Colour = Color4.White
// },
// new Container
// {
// Origin = Anchor.BottomCentre,
// Anchor = Anchor.TopCentre,
// Width = handle_width,
// Height = handle_height,
// CornerRadius = 5,
// Masking = true,
// Children = new Drawable[]
// {
// new Box
// {
// RelativeSizeAxes = Axes.Both,
// Colour = Color4.White
// }
// }
// }
// }
// }
};
}
}