h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:07:52 +08:00
Code Issues Releases Wiki Activity

Adjust borders/layout to better align with grid

Browse Source
This commit is contained in:
Dean Herbert 2023-07-24 20:20:08 +09:00
parent fd1bd0c88a
commit dd32b771cf
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
View File

@ -42,9 +42,11 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
const float border_thickness = 4; const float border_thickness = 5;
const float spacing = 2; const float spacing = 2;
Margin = new MarginPadding(10);
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
Flow = new FillFlowContainer<DrawableMatchTeam> Flow = new FillFlowContainer<DrawableMatchTeam>
@ -56,41 +58,45 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding(-(border_thickness + spacing)), Padding = new MarginPadding(-10),
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Children = new[] Child = selectionBox = new Container
{ {
selectionBox = new Container RelativeSizeAxes = Axes.Both,
Alpha = 0,
Masking = true,
BorderColour = Color4.YellowGreen,
BorderThickness = border_thickness,
Child = new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
AlwaysPresent = true,
Alpha = 0, Alpha = 0,
Masking = true, }
BorderColour = Color4.YellowGreen, },
BorderThickness = border_thickness,
Child = new Box
{
RelativeSizeAxes = Axes.Both,
AlwaysPresent = true,
Alpha = 0,
}
},
CurrentMatchSelectionBox = new Container
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
BorderColour = Color4.White,
BorderThickness = border_thickness,
Masking = true,
Child = new Box
{
RelativeSizeAxes = Axes.Both,
AlwaysPresent = true,
Alpha = 0,
}
},
}
}, },
new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding(-(spacing + border_thickness)),
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Child = CurrentMatchSelectionBox = new Container
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
BorderColour = Color4.White,
BorderThickness = border_thickness,
Masking = true,
Child = new Box
{
RelativeSizeAxes = Axes.Both,
AlwaysPresent = true,
Alpha = 0,
}
},
}
}; };
boundReference(match.Team1).BindValueChanged(_ => updateTeams()); boundReference(match.Team1).BindValueChanged(_ => updateTeams());
@ -117,7 +123,6 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
Position = new Vector2(pos.NewValue.X, pos.NewValue.Y); Position = new Vector2(pos.NewValue.X, pos.NewValue.Y);
Changed?.Invoke(); Changed?.Invoke();
}, true); }, true);
updateTeams(); updateTeams();
} }