h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 07:22:55 +08:00
Code Issues Releases Wiki Activity

IsEnabled property for drag bar of music controller.

Browse Source
This commit is contained in:
Huo Yaoyuan 2016-12-01 08:20:24 +08:00
parent 19897013a0
commit 3a4fb2ffed
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,18 @@ namespace osu.Game.Overlays
public Action<float> SeekRequested; public Action<float> SeekRequested;
private bool isDragging; private bool isDragging;
private bool enabled;
public bool IsEnabled
{
get { return enabled; }
set
{
enabled = value;
if (!enabled)
fill.Width = 0;
}
}
public DragBar() public DragBar()
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
@ -34,13 +46,14 @@ namespace osu.Game.Overlays
public void UpdatePosition(float position) public void UpdatePosition(float position)
{ {
if (isDragging) return; if (isDragging || !IsEnabled) return;
fill.Width = position; fill.Width = position;
} }
private void seek(InputState state) private void seek(InputState state)
{ {
if (!IsEnabled) return;
float seekLocation = state.Mouse.Position.X / DrawWidth; float seekLocation = state.Mouse.Position.X / DrawWidth;
SeekRequested?.Invoke(seekLocation); SeekRequested?.Invoke(seekLocation);
fill.Width = seekLocation; fill.Width = seekLocation;

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

@ -240,6 +240,7 @@ namespace osu.Game.Overlays
private void workingChanged(object sender = null, EventArgs e = null) private void workingChanged(object sender = null, EventArgs e = null)
{ {
progress.IsEnabled = (beatmapSource.Value != null);
if (beatmapSource.Value == current) return; if (beatmapSource.Value == current) return;
bool audioEquals = current?.BeatmapInfo.AudioEquals(beatmapSource.Value.BeatmapInfo) ?? false; bool audioEquals = current?.BeatmapInfo.AudioEquals(beatmapSource.Value.BeatmapInfo) ?? false;
current = beatmapSource.Value; current = beatmapSource.Value;