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

Merge branch 'country-enum' into remove-countries-json

Browse Source
This commit is contained in:
Salman Ahmed 2022-07-16 06:40:23 +03:00
commit fd8a9a5382
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Online/API/Requests/Responses/APIUser.cs
View File

@ -38,11 +38,12 @@ namespace osu.Game.Online.API.Requests.Responses
public Country Country
{
get => country ??= (Enum.TryParse(userCountry.Code, out Country result) ? result : default);
get => country ??= (Enum.TryParse(userCountry?.Code, out Country result) ? result : default);
set => country = value;
}
#pragma warning disable 649
[CanBeNull]
[JsonProperty(@"country")]
private UserCountry userCountry;

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

@ -168,7 +168,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
new UpdateableFlag(score.User.Country)
{
Size = new Vector2(19, 14),
ShowPlaceholderOnNull = false,
ShowPlaceholderOnUnknown = false,
},
username,
new OsuSpriteText

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

@ -120,7 +120,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
Origin = Anchor.CentreLeft,
Size = new Vector2(19, 14),
Margin = new MarginPadding { Top = 3 }, // makes spacing look more even
ShowPlaceholderOnNull = false,
ShowPlaceholderOnUnknown = false,
},
}
}

2
osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
View File

@ -137,7 +137,7 @@ namespace osu.Game.Overlays.Profile.Header
userFlag = new UpdateableFlag
{
Size = new Vector2(28, 20),
ShowPlaceholderOnNull = false,
ShowPlaceholderOnUnknown = false,
},
userCountryText = new OsuSpriteText
{

2
osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
View File

@ -100,7 +100,7 @@ namespace osu.Game.Overlays.Rankings.Tables
new UpdateableFlag(GetCountry(item))
{
Size = new Vector2(28, 20),
ShowPlaceholderOnNull = false,
ShowPlaceholderOnUnknown = false,
},
CreateFlagContent(item)
}

6
osu.Game/Users/Drawables/UpdateableFlag.cs
View File

@ -22,9 +22,9 @@ namespace osu.Game.Users.Drawables
}
/// <summary>
/// Whether to show a place holder on null country.
/// Whether to show a place holder on unknown country.
/// </summary>
public bool ShowPlaceholderOnNull = true;
public bool ShowPlaceholderOnUnknown = true;
/// <summary>
/// Perform an action in addition to showing the country ranking.
@ -39,7 +39,7 @@ namespace osu.Game.Users.Drawables
protected override Drawable CreateDrawable(Country country)
{
if (country == default && !ShowPlaceholderOnNull)
if (country == default && !ShowPlaceholderOnUnknown)
return null;
return new Container