h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 14:12:55 +08:00
Code Issues Releases Wiki Activity

Post-merge fixes.

Browse Source
This commit is contained in:
smoogipooo 2017-03-03 13:17:06 +09:00
parent 09a2d39e3e
commit 959a3d49be
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/Tournament/Drawings.cs
View File

@ -72,10 +72,10 @@ namespace osu.Game.Screens.Tournament
FillMode = FillMode.Fill,
Texture = textures.Get(@"Backgrounds/Drawings/background.png")
},
new FlowContainer()
new FillFlowContainer()
{
RelativeSizeAxes = Axes.Both,
Direction = FlowDirections.Horizontal,
Direction = FillDirection.Right,
Children = new Drawable[]
{
@ -158,7 +158,7 @@ namespace osu.Game.Screens.Tournament
TextSize = 22f,
Font = "Exo2.0-Boldd"
},
new FlowContainer()
new FillFlowContainer()
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
@ -169,7 +169,7 @@ namespace osu.Game.Screens.Tournament
Position = new Vector2(0, 35f),
Direction = FlowDirections.Vertical,
Direction = FillDirection.Down,
Spacing = new Vector2(0, 5f),
Children = new Drawable[]
@ -197,7 +197,7 @@ namespace osu.Game.Screens.Tournament
}
}
},
new FlowContainer()
new FillFlowContainer()
{
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
@ -208,7 +208,7 @@ namespace osu.Game.Screens.Tournament
Position = new Vector2(0, -5f),
Direction = FlowDirections.Vertical,
Direction = FillDirection.Down,
Spacing = new Vector2(0, 5f),
Children = new Drawable[]

14
osu.Game/Screens/Tournament/Group.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Screens.Tournament
Font = @"Exo2.0-Bold",
Colour = new Color4(255, 204, 34, 255),
},
topTeams = new FlowContainer<GroupTeam>()
topTeams = new FillFlowContainer<GroupTeam>()
{
AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X,
@ -72,9 +72,9 @@ namespace osu.Game.Screens.Tournament
Right = 7f
},
Direction = FlowDirections.Horizontal
Direction = FillDirection.Right
},
bottomTeams = new FlowContainer<GroupTeam>()
bottomTeams = new FillFlowContainer<GroupTeam>()
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
@ -91,7 +91,7 @@ namespace osu.Game.Screens.Tournament
Right = 7f
},
Direction = FlowDirections.Horizontal
Direction = FillDirection.Right
}
};
}
@ -159,7 +159,7 @@ namespace osu.Game.Screens.Tournament
{
public Team Team;
private FlowContainer innerContainer;
private FillFlowContainer innerContainer;
private Sprite flagSprite;
public GroupTeam(Team team)
@ -171,7 +171,7 @@ namespace osu.Game.Screens.Tournament
Children = new Drawable[]
{
innerContainer = new FlowContainer()
innerContainer = new FillFlowContainer()
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
@ -179,7 +179,7 @@ namespace osu.Game.Screens.Tournament
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FlowDirections.Vertical,
Direction = FillDirection.Down,
Spacing = new Vector2(0, 5f),
Scale = new Vector2(1.5f),

32
osu.Game/Screens/Tournament/GroupsContainer.cs
View File

@ -27,25 +27,25 @@ namespace osu.Game.Screens.Tournament
Children = new[]
{
topGroups = new FlowContainer<Group>()
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
topGroups = new FillFlowContainer<Group>()
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
AutoSizeAxes = Axes.Both,
AutoSizeAxes = Axes.Both,
Spacing = new Vector2(7f, 0)
},
bottomGroups = new FlowContainer<Group>()
{
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Spacing = new Vector2(7f, 0)
},
bottomGroups = new FillFlowContainer<Group>()
{
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
AutoSizeAxes = Axes.Both,
AutoSizeAxes = Axes.Both,
Spacing = new Vector2(7f, 0)
}
};
Spacing = new Vector2(7f, 0)
}
};
for (int i = 0; i < numGroups; i++)
{
@ -87,7 +87,7 @@ namespace osu.Game.Screens.Tournament
public string ToStringRepresentation()
{
StringBuilder sb = new StringBuilder();
foreach (Group g in allGroups)
{
if (g != allGroups.First())