RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-26 00:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting fixes

Browse Source
This commit is contained in:
smoogipoo 2019-03-06 16:30:56 +09:00
parent 3c999d64d4
commit e3d463a141
8 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/Containers/OsuHoverContainer.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Graphics.Containers
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
if(HoverColour == default)
if (HoverColour == default)
HoverColour = colours.Yellow;
}

9
osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
View File

@ -24,13 +24,17 @@ namespace osu.Game.Overlays.Profile.Header
private Color4 linkBlue, communityUserGrayGreenLighter;
private User user;
public User User
{
get => user;
set
{
if (user == value) return;
if (user == value)
return;
user = value;
updateDisplay();
}
}
@ -131,9 +135,8 @@ namespace osu.Game.Overlays.Profile.Header
});
}
else
{
bottomLinkContainer.AddText(" " + content, bold);
}
addSpacer(bottomLinkContainer);
}

8
osu.Game/Overlays/Profile/Header/CenterHeaderContainer.cs
View File

@ -48,13 +48,17 @@ namespace osu.Game.Overlays.Profile.Header
private APIAccess apiAccess { get; set; }
private User user;
public User User
{
get => user;
set
{
if (user == value) return;
if (user == value)
return;
user = value;
updateDisplay();
}
}
@ -183,7 +187,7 @@ namespace osu.Game.Overlays.Profile.Header
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium)
Font = OsuFont.GetFont(size: 20)
}
}
},

8
osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
View File

@ -26,13 +26,17 @@ namespace osu.Game.Overlays.Profile.Header
private RankGraph rankGraph;
private User user;
public User User
{
get => user;
set
{
if (user == value) return;
if (user == value)
return;
user = value;
updateDisplay();
}
}
@ -181,7 +185,7 @@ namespace osu.Game.Overlays.Profile.Header
totalPlayTimeTooltip.TooltipText = (user?.Statistics?.PlayTime ?? 0) / 3600 + " hours";
foreach (var scoreRankInfo in scoreRankInfos)
scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount.GetForScoreRank(scoreRankInfo.Key) ?? 0;
scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0;
detailGlobalRank.Content = user?.Statistics?.Ranks.Global?.ToString("#,##0") ?? "-";
detailCountryRank.Content = user?.Statistics?.Ranks.Country?.ToString("#,##0") ?? "-";

6
osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
View File

@ -22,13 +22,17 @@ namespace osu.Game.Overlays.Profile.Header
private FillFlowContainer badgeFlowContainer;
private User user;
public User User
{
get => user;
set
{
if (user == value) return;
if (user == value)
return;
user = value;
updateDisplay();
}
}

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

@ -28,13 +28,17 @@ namespace osu.Game.Overlays.Profile.Header
private const float avatar_size = 110;
private User user;
public User User
{
get => user;
set
{
if (user == value) return;
if (user == value)
return;
user = value;
updateDisplay();
}
}

3
osu.Game/Users/User.cs
View File

@ -186,10 +186,13 @@ namespace osu.Game.Users
{
[Description("Keyboard")]
Keyboard,
[Description("Mouse")]
Mouse,
[Description("Tablet")]
Tablet,
[Description("Touch Screen")]
Touch,
}

25
osu.Game/Users/UserStatistics.cs
View File

@ -77,16 +77,25 @@ namespace osu.Game.Users
[JsonProperty(@"a")]
public int A;
public int GetForScoreRank(ScoreRank rank)
public int this[ScoreRank rank]
{
switch (rank)
get
{
case ScoreRank.XH: return SSPlus;
case ScoreRank.X: return SS;
case ScoreRank.SH: return SPlus;
case ScoreRank.S: return S;
case ScoreRank.A: return A;
default: throw new ArgumentException($"API does not return {rank.ToString()}");
switch (rank)
{
case ScoreRank.XH:
return SSPlus;
case ScoreRank.X:
return SS;
case ScoreRank.SH:
return SPlus;
case ScoreRank.S:
return S;
case ScoreRank.A:
return A;
default:
throw new ArgumentException($"API does not return {rank.ToString()}");
}
}
}
}