RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-push-disabled-crash

This commit is contained in:
Dean Herbert 2017-12-31 01:27:41 +09:00 committed by GitHub
parent 44bc6749e3 d5698374f0
commit c8bab7d983
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
View File

@ -48,7 +48,7 @@ public DrawableScore(int index, OnlineScore score)
Font = @"Exo2.0-RegularItalic", Font = @"Exo2.0-RegularItalic",
Margin = new MarginPadding { Left = side_margin } Margin = new MarginPadding { Left = side_margin }
}, },
new DrawableFlag(score.User.Country?.FlagName) new DrawableFlag(score.User.Country)
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,

2
osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
View File

@ -52,7 +52,7 @@ public OnlineScore Score
score = value; score = value;
avatar.User = username.User = score.User; avatar.User = username.User = score.User;
flag.FlagName = score.User.Country?.FlagName; flag.Country = score.User.Country;
date.Text = $@"achieved {score.Date:MMM d, yyyy}"; date.Text = $@"achieved {score.Date:MMM d, yyyy}";
rank.UpdateRank(score.Rank); rank.UpdateRank(score.Rank);

4
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -109,7 +109,7 @@ public ProfileHeader(User user)
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Y = -48, Y = -48,
}, },
countryFlag = new DrawableFlag(user.Country?.FlagName) countryFlag = new DrawableFlag(user.Country)
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
@ -333,7 +333,7 @@ private void loadUser()
{ {
infoTextLeft.AddText("from "); infoTextLeft.AddText("from ");
infoTextLeft.AddText(user.Country.FullName, boldItalic); infoTextLeft.AddText(user.Country.FullName, boldItalic);
countryFlag.FlagName = user.Country.FlagName; countryFlag.Country = user.Country;
} }
infoTextLeft.NewParagraph(); infoTextLeft.NewParagraph();

2
osu.Game/Screens/Multiplayer/ParticipantInfo.cs
View File

@ -27,7 +27,7 @@ public User Host
set set
{ {
host.Text = value.Username; host.Text = value.Username;
flagContainer.Children = new[] { new DrawableFlag(value.Country?.FlagName) { RelativeSizeAxes = Axes.Both } }; flagContainer.Children = new[] { new DrawableFlag(value.Country) { RelativeSizeAxes = Axes.Both } };
} }
} }

2
osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
View File

@ -145,7 +145,7 @@ private void load()
Masking = true, Masking = true,
Children = new Drawable[] Children = new Drawable[]
{ {
new DrawableFlag(Score.User?.Country?.FlagName) new DrawableFlag(Score.User?.Country)
{ {
Width = 30, Width = 30,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,

43
osu.Game/Users/Country.cs
View File

@ -6,6 +6,7 @@
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
@ -26,36 +27,30 @@ public class Country
public string FlagName; public string FlagName;
} }
public class DrawableFlag : Container public class DrawableFlag : Container, IHasTooltip
{ {
private readonly Sprite sprite; private readonly Sprite sprite;
private TextureStore textures; private TextureStore textures;
private string flagName; private Country country;
public string FlagName public Country Country
{ {
get { return flagName; } get { return country; }
set set
{ {
if (value == flagName) return; if (value == country)
flagName = value; return;
sprite.Texture = textures.Get($@"Flags/{flagName}");
country = value;
sprite.Texture = getFlagTexture();
} }
} }
[BackgroundDependencyLoader] public string TooltipText => country?.FullName;
private void load(TextureStore ts)
{
if (ts == null)
throw new ArgumentNullException(nameof(ts));
textures = ts; public DrawableFlag(Country country = null)
sprite.Texture = textures.Get($@"Flags/{flagName}");
}
public DrawableFlag(string name = null)
{ {
flagName = name ?? @"__"; this.country = country;
Children = new Drawable[] Children = new Drawable[]
{ {
@ -65,5 +60,17 @@ public DrawableFlag(string name = null)
}, },
}; };
} }
[BackgroundDependencyLoader]
private void load(TextureStore ts)
{
if (ts == null)
throw new ArgumentNullException(nameof(ts));
textures = ts;
sprite.Texture = getFlagTexture();
}
private Texture getFlagTexture() => textures.Get($@"Flags/{country?.FlagName ?? @"__"}");
} }
} }

2
osu.Game/Users/UserPanel.cs
View File

@ -114,7 +114,7 @@ public UserPanel(User user)
Spacing = new Vector2(5f, 0f), Spacing = new Vector2(5f, 0f),
Children = new Drawable[] Children = new Drawable[]
{ {
new DrawableFlag(user.Country?.FlagName) new DrawableFlag(user.Country)
{ {
Width = 30f, Width = 30f,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,