1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 22:22:54 +08:00

move songprogress up to be able to see below for masking

This commit is contained in:
Unknown 2019-07-05 08:29:57 +02:00
parent c22667bdf7
commit 1cb7a9617b

View File

@ -6,9 +6,12 @@ using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Framework.Timing; using osu.Framework.Timing;
using osu.Game.Graphics;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
@ -24,6 +27,7 @@ namespace osu.Game.Tests.Visual.Gameplay
private SongProgress progress; private SongProgress progress;
private TestSongProgressGraph graph; private TestSongProgressGraph graph;
private readonly Container progressContainer;
private readonly StopwatchClock clock; private readonly StopwatchClock clock;
private readonly FramedClock framedClock; private readonly FramedClock framedClock;
@ -35,6 +39,20 @@ namespace osu.Game.Tests.Visual.Gameplay
{ {
clock = new StopwatchClock(); clock = new StopwatchClock();
gameplayClock = new GameplayClock(framedClock = new FramedClock(clock)); gameplayClock = new GameplayClock(framedClock = new FramedClock(clock));
Add(progressContainer = new Container
{
RelativeSizeAxes = Axes.X,
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Height = 100,
Y = -100,
Child = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = OsuColour.Gray(1),
}
});
} }
[SetUpSteps] [SetUpSteps]
@ -48,7 +66,7 @@ namespace osu.Game.Tests.Visual.Gameplay
progress = null; progress = null;
} }
Add(progress = new SongProgress progressContainer.Add(progress = new SongProgress
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
@ -91,6 +109,7 @@ namespace osu.Game.Tests.Visual.Gameplay
public void TestDisplay() public void TestDisplay()
{ {
AddStep("display max values", displayMaxValues); AddStep("display max values", displayMaxValues);
AddUntilStep("wait for graph", () => graph.CreationCount == 1);
AddStep("start", clock.Start); AddStep("start", clock.Start);
AddStep("show bar", () => progress.AllowSeeking = true); AddStep("show bar", () => progress.AllowSeeking = true);
AddStep("hide graph", () => progress.CollapseGraph.Value = true); AddStep("hide graph", () => progress.CollapseGraph.Value = true);