Applied suggested changes

This commit is contained in:
EVAST9919
2017-05-29 19:00:29 +03:00
parent 261f1f4e1f
commit 08219ccb42
9 changed files with 52 additions and 70 deletions

View File

@ -40,7 +40,7 @@ namespace osu.Game.Graphics.UserInterface
BorderColour = Color4.Black;
BorderThickness = border_thickness;
Children = new Drawable[]
InternalChildren = new Drawable[]
{
new Box
{
@ -59,10 +59,10 @@ namespace osu.Game.Graphics.UserInterface
new Container
{
Name = @"Header",
RelativeSizeAxes = Axes.X,
Height = header_height,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
RelativeSizeAxes = Axes.X,
Height = header_height,
Children = new Drawable[]
{
@ -90,13 +90,13 @@ namespace osu.Game.Graphics.UserInterface
content = new FillFlowContainer
{
Name = @"Content",
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
Direction = FillDirection.Vertical,
RelativeSizeAxes = Axes.X,
AutoSizeDuration = transition_duration,
AutoSizeEasing = EasingTypes.OutQuint,
AutoSizeAxes = Axes.Y,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
Padding = new MarginPadding(15),
Spacing = new Vector2(0, 15),
}
@ -105,10 +105,7 @@ namespace osu.Game.Graphics.UserInterface
};
}
public new void Add(Drawable drawable)
{
content.Add(drawable);
}
protected override Container<Drawable> Content => content;
private void triggerContentVisibility()
{

View File

@ -44,12 +44,12 @@ namespace osu.Game.Graphics.UserInterface
{
content = new Container
{
Size = new Vector2(button_size),
CornerRadius = 5,
Masking = true,
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Size = new Vector2 (button_size),
CornerRadius = 5,
Masking = true,
EdgeEffect = new EdgeEffect
{
Colour = Color4.Black.Opacity(0.04f),
@ -65,9 +65,9 @@ namespace osu.Game.Graphics.UserInterface
},
icon = new TextAwesome
{
TextSize = 18,
Origin = Anchor.Centre,
Anchor = Anchor.Centre
Anchor = Anchor.Centre,
TextSize = 18,
}
}
}