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

Move CountryPill to it's own class

Browse Source
This commit is contained in:
Andrei Zavatski 2020-01-09 00:27:22 +03:00
parent 29c4ae68d9
commit 0d9fb065da
3 changed files with 150 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
View File

@ -19,6 +19,7 @@ namespace osu.Game.Tests.Visual.Online
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(CountryFilter),
typeof(CountryPill)
};
public TestSceneRankingsCountryFilter()

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

@ -1,19 +1,14 @@
// 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 osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Users;
using osu.Game.Users.Drawables;
using osuTK;
namespace osu.Game.Overlays.Rankings
@ -98,135 +93,5 @@ namespace osu.Game.Overlays.Rankings
content.FadeIn(duration, Easing.OutQuint);
countryPill.Expand();
}
private class CountryPill : CircularContainer
{
private readonly Box background;
private readonly UpdateableFlag flag;
private readonly OsuSpriteText countryName;
public readonly Bindable<Country> Country = new Bindable<Country>();
public CountryPill()
{
AutoSizeDuration = duration;
AutoSizeEasing = Easing.OutQuint;
Height = 25;
Masking = true;
Children = new Drawable[]
{
background = new Box
{
RelativeSizeAxes = Axes.Both
},
new FillFlowContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Margin = new MarginPadding { Horizontal = 10 },
Direction = FillDirection.Horizontal,
Spacing = new Vector2(8, 0),
Children = new Drawable[]
{
new FillFlowContainer
{
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(3, 0),
Children = new Drawable[]
{
flag = new UpdateableFlag
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(22, 15)
},
countryName = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Font = OsuFont.GetFont(size: 14)
}
}
},
new CloseButton
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
ClickAction = () => Country.Value = null
}
}
}
};
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
background.Colour = colours.GreySeafoamDarker;
}
protected override void LoadComplete()
{
base.LoadComplete();
Country.BindValueChanged(onCountryChanged, true);
}
public void Expand()
{
ClearTransforms();
AutoSizeAxes = Axes.X;
this.FadeIn(duration, Easing.OutQuint);
}
public void Collapse()
{
ClearTransforms();
AutoSizeAxes = Axes.None;
this.ResizeWidthTo(0, duration, Easing.OutQuint);
this.FadeOut(duration, Easing.OutQuint);
}
private void onCountryChanged(ValueChangedEvent<Country> country)
{
if (country.NewValue == null)
return;
flag.Country = country.NewValue;
countryName.Text = country.NewValue.FullName;
}
private class CloseButton : Container
{
public Action ClickAction;
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
AutoSizeAxes = Axes.Both;
Children = new Drawable[]
{
new SpriteIcon
{
Size = new Vector2(8),
Icon = FontAwesome.Solid.Times,
Colour = colours.GreySeafoamLighter,
},
new HoverClickSounds(),
};
}
protected override bool OnClick(ClickEvent e)
{
ClickAction?.Invoke();
return base.OnClick(e);
}
}
}
}
}

149
osu.Game/Overlays/Rankings/CountryPill.cs Normal file
View File

@ -0,0 +1,149 @@
// 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.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Users;
using osu.Game.Users.Drawables;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Overlays.Rankings
{
public class CountryPill : CircularContainer
{
private const int duration = 200;
private readonly Box background;
private readonly UpdateableFlag flag;
private readonly OsuSpriteText countryName;
public readonly Bindable<Country> Country = new Bindable<Country>();
public CountryPill()
{
AutoSizeDuration = duration;
AutoSizeEasing = Easing.OutQuint;
Height = 25;
Masking = true;
Children = new Drawable[]
{
background = new Box
{
RelativeSizeAxes = Axes.Both
},
new FillFlowContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Margin = new MarginPadding { Horizontal = 10 },
Direction = FillDirection.Horizontal,
Spacing = new Vector2(8, 0),
Children = new Drawable[]
{
new FillFlowContainer
{
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(3, 0),
Children = new Drawable[]
{
flag = new UpdateableFlag
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(22, 15)
},
countryName = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Font = OsuFont.GetFont(size: 14)
}
}
},
new CloseButton
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Action = () => Country.Value = null
}
}
}
};
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
background.Colour = colours.GreySeafoamDarker;
}
protected override void LoadComplete()
{
base.LoadComplete();
Country.BindValueChanged(onCountryChanged, true);
}
public void Expand()
{
ClearTransforms();
AutoSizeAxes = Axes.X;
this.FadeIn(duration, Easing.OutQuint);
}
public void Collapse()
{
ClearTransforms();
AutoSizeAxes = Axes.None;
this.ResizeWidthTo(0, duration, Easing.OutQuint);
this.FadeOut(duration, Easing.OutQuint);
}
private void onCountryChanged(ValueChangedEvent<Country> country)
{
if (country.NewValue == null)
return;
flag.Country = country.NewValue;
countryName.Text = country.NewValue.FullName;
}
private class CloseButton : OsuHoverContainer
{
private readonly SpriteIcon icon;
protected override IEnumerable<Drawable> EffectTargets => new[] { icon };
public CloseButton()
{
AutoSizeAxes = Axes.Both;
Add(icon = new SpriteIcon
{
Size = new Vector2(8),
Icon = FontAwesome.Solid.Times
});
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
IdleColour = colours.GreySeafoamLighter;
HoverColour = Color4.White;
}
}
}
}