RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/2yangk23/master' 

# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
This commit is contained in:
Dean Herbert 2017-03-16 16:38:42 +09:00
parent 334e389518 58fc0a2622
commit 95757ac420
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
View File

@ -1,14 +1,12 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Diagnostics; using OpenTK;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Framework.Screens.Testing; using osu.Framework.Screens.Testing;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Screens.Select.Filter;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Select.Filter;
namespace osu.Desktop.VisualTests.Tests namespace osu.Desktop.VisualTests.Tests
{ {
@ -22,24 +20,16 @@ public override void Reset()
OsuSpriteText text; OsuSpriteText text;
OsuTabControl<GroupMode> filter; OsuTabControl<GroupMode> filter;
Add(filter = new OsuTabControl<GroupMode>
Add(new FillFlowContainer
{
Direction = FillDirection.Horizontal,
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
filter = new OsuTabControl<GroupMode>
{ {
Width = 229, Width = 229,
AutoSort = true AutoSort = true
}, });
text = new OsuSpriteText Add(text = new OsuSpriteText
{ {
Text = "None", Text = "None",
Margin = new MarginPadding(4) Margin = new MarginPadding(4),
} Position = new Vector2(275, 5)
}
}); });
filter.PinTab(GroupMode.All); filter.PinTab(GroupMode.All);
@ -47,8 +37,7 @@ public override void Reset()
filter.ValueChanged += (sender, mode) => filter.ValueChanged += (sender, mode) =>
{ {
Debug.WriteLine($"Selected {mode}"); text.Text = "Currently Selected: " + mode.ToString();
text.Text = mode.ToString();
}; };
} }
} }