sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 09:03:50 +09:00
Code Issues Packages Projects 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
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, FillMode = FillMode.Fill,
Texture = textures.Get(@"Backgrounds/Drawings/background.png") Texture = textures.Get(@"Backgrounds/Drawings/background.png")
}, },
new FlowContainer() new FillFlowContainer()
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Direction = FlowDirections.Horizontal, Direction = FillDirection.Right,
Children = new Drawable[] Children = new Drawable[]
{ {
@ -158,7 +158,7 @@ namespace osu.Game.Screens.Tournament
TextSize = 22f, TextSize = 22f,
Font = "Exo2.0-Boldd" Font = "Exo2.0-Boldd"
}, },
new FlowContainer() new FillFlowContainer()
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
@ -169,7 +169,7 @@ namespace osu.Game.Screens.Tournament
Position = new Vector2(0, 35f), Position = new Vector2(0, 35f),
Direction = FlowDirections.Vertical, Direction = FillDirection.Down,
Spacing = new Vector2(0, 5f), Spacing = new Vector2(0, 5f),
Children = new Drawable[] Children = new Drawable[]
@ -197,7 +197,7 @@ namespace osu.Game.Screens.Tournament
} }
} }
}, },
new FlowContainer() new FillFlowContainer()
{ {
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
@ -208,7 +208,7 @@ namespace osu.Game.Screens.Tournament
Position = new Vector2(0, -5f), Position = new Vector2(0, -5f),
Direction = FlowDirections.Vertical, Direction = FillDirection.Down,
Spacing = new Vector2(0, 5f), Spacing = new Vector2(0, 5f),
Children = new Drawable[] 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", Font = @"Exo2.0-Bold",
Colour = new Color4(255, 204, 34, 255), Colour = new Color4(255, 204, 34, 255),
}, },
topTeams = new FlowContainer<GroupTeam>() topTeams = new FillFlowContainer<GroupTeam>()
{ {
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
@ -72,9 +72,9 @@ namespace osu.Game.Screens.Tournament
Right = 7f Right = 7f
}, },
Direction = FlowDirections.Horizontal Direction = FillDirection.Right
}, },
bottomTeams = new FlowContainer<GroupTeam>() bottomTeams = new FillFlowContainer<GroupTeam>()
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
@ -91,7 +91,7 @@ namespace osu.Game.Screens.Tournament
Right = 7f Right = 7f
}, },
Direction = FlowDirections.Horizontal Direction = FillDirection.Right
} }
}; };
} }
@ -159,7 +159,7 @@ namespace osu.Game.Screens.Tournament
{ {
public Team Team; public Team Team;
private FlowContainer innerContainer; private FillFlowContainer innerContainer;
private Sprite flagSprite; private Sprite flagSprite;
public GroupTeam(Team team) public GroupTeam(Team team)
@ -171,7 +171,7 @@ namespace osu.Game.Screens.Tournament
Children = new Drawable[] Children = new Drawable[]
{ {
innerContainer = new FlowContainer() innerContainer = new FillFlowContainer()
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -179,7 +179,7 @@ namespace osu.Game.Screens.Tournament
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Direction = FlowDirections.Vertical, Direction = FillDirection.Down,
Spacing = new Vector2(0, 5f), Spacing = new Vector2(0, 5f),
Scale = new Vector2(1.5f), Scale = new Vector2(1.5f),

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

@ -27,7 +27,7 @@ namespace osu.Game.Screens.Tournament
Children = new[] Children = new[]
{ {
topGroups = new FlowContainer<Group>() topGroups = new FillFlowContainer<Group>()
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
@ -36,7 +36,7 @@ namespace osu.Game.Screens.Tournament
Spacing = new Vector2(7f, 0) Spacing = new Vector2(7f, 0)
}, },
bottomGroups = new FlowContainer<Group>() bottomGroups = new FillFlowContainer<Group>()
{ {
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,