Merge branch 'master' into open-downloaded-beatmas

This commit is contained in:
Dean Herbert
2018-07-28 12:44:34 +09:00
committed by GitHub
26 changed files with 56 additions and 57 deletions

View File

@ -4,6 +4,7 @@
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Screens.Edit.Screens.Setup.Components.LabelledComponents;
using System;
using System.Collections.Generic;
@ -21,15 +22,18 @@ namespace osu.Game.Tests.Visual
[BackgroundDependencyLoader]
private void load()
{
Children = new Drawable[]
Child = new Container
{
new LabelledTextBox
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.X,
Padding = new MarginPadding { Left = 150, Right = 150 },
Child = new LabelledTextBox
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
LabelText = "Testing text",
PlaceholderText = "This is definitely working as intended",
Padding = new MarginPadding { Left = 150, Right = 150 }
}
};
}