1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-07 20:42:54 +08:00

moved autosize to ctor and whitespace fix

This commit is contained in:
EVAST9919 2017-05-19 16:08:33 +03:00
parent b2b299a8c3
commit 6f0e1fccdb
4 changed files with 25 additions and 25 deletions

View File

@ -19,7 +19,6 @@ namespace osu.Desktop.VisualTests.Tests
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
AutoSizeAxes = Axes.Both,
}); });
} }
} }

View File

@ -42,35 +42,35 @@ namespace osu.Game.Graphics.UserInterface
Children = new Drawable[] Children = new Drawable[]
{ {
content = new Container content = new Container
{ {
Size = new Vector2(button_size), Size = new Vector2(button_size),
CornerRadius = 5, CornerRadius = 5,
Masking = true, Masking = true,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
EdgeEffect = new EdgeEffect EdgeEffect = new EdgeEffect
{
Colour = Color4.Black.Opacity(0.04f),
Type = EdgeEffectType.Shadow,
Radius = 5,
},
Children = new Drawable[]
{
hover = new Box
{ {
Colour = Color4.Black.Opacity(0.04f), RelativeSizeAxes = Axes.Both,
Type = EdgeEffectType.Shadow, Alpha = 0,
Radius = 5,
}, },
Children = new Drawable[] icon = new TextAwesome
{ {
hover = new Box TextSize = 18,
{ Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, Anchor = Anchor.Centre
Alpha = 0,
},
icon = new TextAwesome
{
TextSize = 18,
Origin = Anchor.Centre,
Anchor = Anchor.Centre
}
} }
} }
}
}; };
} }

View File

@ -3,6 +3,7 @@
using OpenTK; using OpenTK;
using OpenTK.Input; using OpenTK.Input;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Input; using osu.Framework.Input;
@ -32,6 +33,7 @@ namespace osu.Game.Screens.Play.Settings
{ {
AlwaysPresent = true; AlwaysPresent = true;
Direction = FillDirection.Vertical; Direction = FillDirection.Vertical;
AutoSizeAxes = Axes.Both;
Spacing = new Vector2(0, 20); Spacing = new Vector2(0, 20);
Add(new CollectionSettings()); Add(new CollectionSettings());

View File

@ -76,7 +76,6 @@ namespace osu.Game.Screens.Play
{ {
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
AutoSizeAxes = Axes.Both,
Margin = new MarginPadding { Top = 100, Right = 10 }, Margin = new MarginPadding { Top = 100, Right = 10 },
}; };