h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 03:27:24 +08:00
Code Issues Releases Wiki Activity

Adjust CountryFilter spacing to match web

Browse Source
This commit is contained in:
TheWildTree 2020-02-29 15:14:25 +01:00
parent 6d09f1eea4
commit 0760ccf024
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/Rankings/CountryFilter.cs
View File

@ -1,4 +1,4 @@
// 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 osu.Framework.Allocation; using osu.Framework.Allocation;
@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Rankings
public class CountryFilter : CompositeDrawable, IHasCurrentValue<Country> public class CountryFilter : CompositeDrawable, IHasCurrentValue<Country>
{ {
private const int duration = 200; private const int duration = 200;
private const int height = 50; private const int height = 70;
private readonly BindableWithCurrent<Country> current = new BindableWithCurrent<Country>(); private readonly BindableWithCurrent<Country> current = new BindableWithCurrent<Country>();

12
osu.Game/Overlays/Rankings/CountryPill.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Rankings
InternalChild = content = new CircularContainer InternalChild = content = new CircularContainer
{ {
Height = 25, Height = 30,
AutoSizeDuration = duration, AutoSizeDuration = duration,
AutoSizeEasing = Easing.OutQuint, AutoSizeEasing = Easing.OutQuint,
Masking = true, Masking = true,
@ -58,9 +58,9 @@ namespace osu.Game.Overlays.Rankings
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,
Margin = new MarginPadding { Horizontal = 10 }, Margin = new MarginPadding { Horizontal = 15 },
Direction = FillDirection.Horizontal, Direction = FillDirection.Horizontal,
Spacing = new Vector2(8, 0), Spacing = new Vector2(15, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
new FillFlowContainer new FillFlowContainer
@ -70,14 +70,14 @@ namespace osu.Game.Overlays.Rankings
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Direction = FillDirection.Horizontal, Direction = FillDirection.Horizontal,
Spacing = new Vector2(3, 0), Spacing = new Vector2(5, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
flag = new UpdateableFlag flag = new UpdateableFlag
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(22, 15) Size = new Vector2(30, 20)
}, },
countryName = new OsuSpriteText countryName = new OsuSpriteText
{ {
@ -148,7 +148,7 @@ namespace osu.Game.Overlays.Rankings
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
Add(icon = new SpriteIcon Add(icon = new SpriteIcon
{ {
Size = new Vector2(8), Size = new Vector2(10),
Icon = FontAwesome.Solid.Times Icon = FontAwesome.Solid.Times
}); });
} }