1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 05:22:54 +08:00

Adjust metrics to align logo pieces correctly on gameplay / map pool

This commit is contained in:
Dean Herbert 2020-03-12 14:26:39 +09:00
parent 7b1ac03b18
commit ec1c6f88ee
5 changed files with 14 additions and 4 deletions

View File

@ -1,9 +1,12 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Gameplay.Components;
using osuTK;
@ -11,6 +14,12 @@ namespace osu.Game.Tournament.Tests.Components
{
public class TestSceneMatchHeader : TournamentTestScene
{
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(DrawableTournamentHeaderText),
typeof(DrawableTournamentHeaderLogo),
};
public TestSceneMatchHeader()
{
Child = new FillFlowContainer

View File

@ -15,7 +15,7 @@ namespace osu.Game.Tournament.Components
{
InternalChild = new LogoSprite();
Height = 50;
Height = 82;
RelativeSizeAxes = Axes.X;
}

View File

@ -15,7 +15,7 @@ namespace osu.Game.Tournament.Components
{
InternalChild = new TextSprite();
Height = 25;
Height = 22;
RelativeSizeAxes = Axes.X;
}

View File

@ -61,7 +61,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
{
RelativeSizeAxes = Axes.Both,
Direction = FillDirection.Vertical,
Padding = new MarginPadding(5),
Padding = new MarginPadding(20),
Spacing = new Vector2(5),
Children = new Drawable[]
{

View File

@ -50,7 +50,7 @@ namespace osu.Game.Tournament.Screens.MapPool
new MatchHeader(),
mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
{
Y = 100,
Y = 140,
Spacing = new Vector2(10, 10),
Padding = new MarginPadding(25),
Direction = FillDirection.Vertical,
@ -235,6 +235,7 @@ namespace osu.Game.Tournament.Screens.MapPool
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Height = 42,
});
}
}