mirror of https://github.com/ppy/osu
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
This commit is contained in:
commit
c01f3a58cb
|
@ -34,6 +34,7 @@ public void TestStartStop()
|
||||||
PreviewTrack track = null;
|
PreviewTrack track = null;
|
||||||
|
|
||||||
AddStep("get track", () => track = getOwnedTrack());
|
AddStep("get track", () => track = getOwnedTrack());
|
||||||
|
AddUntilStep("wait loaded", () => track.IsLoaded);
|
||||||
AddStep("start", () => track.Start());
|
AddStep("start", () => track.Start());
|
||||||
AddAssert("started", () => track.IsRunning);
|
AddAssert("started", () => track.IsRunning);
|
||||||
AddStep("stop", () => track.Stop());
|
AddStep("stop", () => track.Stop());
|
||||||
|
@ -52,6 +53,8 @@ public void TestStartMultipleTracks()
|
||||||
track2 = getOwnedTrack();
|
track2 = getOwnedTrack();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
AddUntilStep("wait loaded", () => track1.IsLoaded && track2.IsLoaded);
|
||||||
|
|
||||||
AddStep("start track 1", () => track1.Start());
|
AddStep("start track 1", () => track1.Start());
|
||||||
AddStep("start track 2", () => track2.Start());
|
AddStep("start track 2", () => track2.Start());
|
||||||
AddAssert("track 1 stopped", () => !track1.IsRunning);
|
AddAssert("track 1 stopped", () => !track1.IsRunning);
|
||||||
|
@ -64,6 +67,7 @@ public void TestCancelFromOwner()
|
||||||
PreviewTrack track = null;
|
PreviewTrack track = null;
|
||||||
|
|
||||||
AddStep("get track", () => track = getOwnedTrack());
|
AddStep("get track", () => track = getOwnedTrack());
|
||||||
|
AddUntilStep("wait loaded", () => track.IsLoaded);
|
||||||
AddStep("start", () => track.Start());
|
AddStep("start", () => track.Start());
|
||||||
AddStep("stop by owner", () => trackManager.StopAnyPlaying(this));
|
AddStep("stop by owner", () => trackManager.StopAnyPlaying(this));
|
||||||
AddAssert("stopped", () => !track.IsRunning);
|
AddAssert("stopped", () => !track.IsRunning);
|
||||||
|
@ -76,6 +80,7 @@ public void TestCancelFromNonOwner()
|
||||||
PreviewTrack track = null;
|
PreviewTrack track = null;
|
||||||
|
|
||||||
AddStep("get track", () => Add(owner = new TestTrackOwner(track = getTrack())));
|
AddStep("get track", () => Add(owner = new TestTrackOwner(track = getTrack())));
|
||||||
|
AddUntilStep("wait loaded", () => track.IsLoaded);
|
||||||
AddStep("start", () => track.Start());
|
AddStep("start", () => track.Start());
|
||||||
AddStep("attempt stop", () => trackManager.StopAnyPlaying(this));
|
AddStep("attempt stop", () => trackManager.StopAnyPlaying(this));
|
||||||
AddAssert("not stopped", () => track.IsRunning);
|
AddAssert("not stopped", () => track.IsRunning);
|
||||||
|
@ -89,16 +94,24 @@ private PreviewTrack getOwnedTrack()
|
||||||
{
|
{
|
||||||
var track = getTrack();
|
var track = getTrack();
|
||||||
|
|
||||||
Add(track);
|
LoadComponentAsync(track, Add);
|
||||||
|
|
||||||
return track;
|
return track;
|
||||||
}
|
}
|
||||||
|
|
||||||
private class TestTrackOwner : CompositeDrawable, IPreviewTrackOwner
|
private class TestTrackOwner : CompositeDrawable, IPreviewTrackOwner
|
||||||
{
|
{
|
||||||
|
private readonly PreviewTrack track;
|
||||||
|
|
||||||
public TestTrackOwner(PreviewTrack track)
|
public TestTrackOwner(PreviewTrack track)
|
||||||
{
|
{
|
||||||
AddInternal(track);
|
this.track = track;
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load()
|
||||||
|
{
|
||||||
|
LoadComponentAsync(track, AddInternal);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
|
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
namespace osu.Game.Audio
|
namespace osu.Game.Audio
|
||||||
{
|
{
|
||||||
|
[LongRunningLoad]
|
||||||
public abstract class PreviewTrack : Component
|
public abstract class PreviewTrack : Component
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
|
|
||||||
namespace osu.Game.Beatmaps.Drawables
|
namespace osu.Game.Beatmaps.Drawables
|
||||||
{
|
{
|
||||||
|
[LongRunningLoad]
|
||||||
public class BeatmapSetCover : Sprite
|
public class BeatmapSetCover : Sprite
|
||||||
{
|
{
|
||||||
private readonly BeatmapSetInfo set;
|
private readonly BeatmapSetInfo set;
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
using osu.Framework.Graphics.Primitives;
|
using osu.Framework.Graphics.Primitives;
|
||||||
using osu.Framework.Input;
|
using osu.Framework.Input;
|
||||||
using osu.Framework.Input.Events;
|
using osu.Framework.Input.Events;
|
||||||
|
using osu.Framework.Timing;
|
||||||
using osu.Game.Rulesets.Edit;
|
using osu.Game.Rulesets.Edit;
|
||||||
using osu.Game.Rulesets.Edit.Tools;
|
using osu.Game.Rulesets.Edit.Tools;
|
||||||
using osu.Game.Rulesets.Objects;
|
using osu.Game.Rulesets.Objects;
|
||||||
|
@ -30,6 +31,9 @@ public class BlueprintContainer : CompositeDrawable
|
||||||
private SelectionHandler selectionHandler;
|
private SelectionHandler selectionHandler;
|
||||||
private InputManager inputManager;
|
private InputManager inputManager;
|
||||||
|
|
||||||
|
[Resolved]
|
||||||
|
private IAdjustableClock adjustableClock { get; set; }
|
||||||
|
|
||||||
[Resolved]
|
[Resolved]
|
||||||
private HitObjectComposer composer { get; set; }
|
private HitObjectComposer composer { get; set; }
|
||||||
|
|
||||||
|
@ -106,6 +110,17 @@ protected override bool OnClick(ClickEvent e)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override bool OnDoubleClick(DoubleClickEvent e)
|
||||||
|
{
|
||||||
|
SelectionBlueprint clickedBlueprint = selectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered);
|
||||||
|
|
||||||
|
if (clickedBlueprint == null)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
adjustableClock?.Seek(clickedBlueprint.DrawableObject.HitObject.StartTime);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
protected override bool OnMouseUp(MouseUpEvent e)
|
protected override bool OnMouseUp(MouseUpEvent e)
|
||||||
{
|
{
|
||||||
// Special case for when a drag happened instead of a click
|
// Special case for when a drag happened instead of a click
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
|
|
||||||
namespace osu.Game.Users.Drawables
|
namespace osu.Game.Users.Drawables
|
||||||
{
|
{
|
||||||
|
[LongRunningLoad]
|
||||||
public class DrawableAvatar : Container
|
public class DrawableAvatar : Container
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
Loading…
Reference in New Issue