From e1f6ab1a4289d77df6ec9625b1657fe5ace4a3a8 Mon Sep 17 00:00:00 2001 From: Huo Yaoyuan Date: Mon, 24 Oct 2016 10:22:38 +0800 Subject: [PATCH] Create MusicController UI class and visual test. --- .../Tests/TestCaseMusicController.cs | 32 +++++++++++++++++++ .../osu.Desktop.VisualTests.csproj | 1 + osu.Game/Overlays/MusicController.cs | 25 +++++++++++++++ osu.Game/osu.Game.csproj | 1 + 4 files changed, 59 insertions(+) create mode 100644 osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs create mode 100644 osu.Game/Overlays/MusicController.cs diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs new file mode 100644 index 0000000000..d17f99f108 --- /dev/null +++ b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs @@ -0,0 +1,32 @@ +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using osu.Framework.Graphics; +using osu.Framework.GameModes.Testing; +using osu.Game.Overlays; + +namespace osu.Desktop.Tests +{ + class TestCaseMusicController : TestCase + { + public override string Name => @"Music Controller"; + public override string Description => @"Tests music controller ui."; + + public override void Reset() + { + base.Reset(); + MusicController mc = new MusicController + { + Origin = Anchor.Centre, + Anchor = Anchor.Centre + }; + Add(mc); + AddToggle(@"Show", mc.ToggleVisibility); + } + } +} diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj index 65fb72e2a6..a09786f873 100644 --- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj +++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj @@ -156,6 +156,7 @@ + diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs new file mode 100644 index 0000000000..d727431788 --- /dev/null +++ b/osu.Game/Overlays/MusicController.cs @@ -0,0 +1,25 @@ +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework; +using osu.Framework.Graphics.Containers; + +namespace osu.Game.Overlays +{ + public class MusicController : OverlayContainer + { + public override void Load(BaseGame game) + { + base.Load(game); + Width = 400; + Height = 130; + CornerRadius = 5; + Masking = true; + } + + //placeholder for toggling + protected override void PopIn() => FadeIn(500); + + protected override void PopOut() => FadeOut(500); + } +} diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 5029d3453d..28297fcca1 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -63,6 +63,7 @@ +