h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs
View File

@ -1,9 +1,12 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // 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;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Gameplay.Components; using osu.Game.Tournament.Screens.Gameplay.Components;
using osuTK; using osuTK;
@ -11,6 +14,12 @@ namespace osu.Game.Tournament.Tests.Components
{ {
public class TestSceneMatchHeader : TournamentTestScene public class TestSceneMatchHeader : TournamentTestScene
{ {
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(DrawableTournamentHeaderText),
typeof(DrawableTournamentHeaderLogo),
};
public TestSceneMatchHeader() public TestSceneMatchHeader()
{ {
Child = new FillFlowContainer Child = new FillFlowContainer

2
osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs
View File

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

2
osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
View File

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

2
osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
View File

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

3
osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
View File

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