diff --git a/osu.Game/Graphics/Containers/OsuTextFlowContainer.cs b/osu.Game/Graphics/Containers/OsuTextFlowContainer.cs index 570e682618..143f38ced4 100644 --- a/osu.Game/Graphics/Containers/OsuTextFlowContainer.cs +++ b/osu.Game/Graphics/Containers/OsuTextFlowContainer.cs @@ -2,7 +2,6 @@ // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; -using System.Collections.Generic; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; using osu.Game.Graphics.Sprites; @@ -17,6 +16,6 @@ namespace osu.Game.Graphics.Containers protected override SpriteText CreateSpriteText() => new OsuSpriteText(); - public IEnumerable AddTextAwesome(FontAwesome icon, Action creationParameters = null) => AddText(((char)icon).ToString(), creationParameters); + public void AddIcon(FontAwesome icon, Action creationParameters = null) => AddText(((char)icon).ToString(), creationParameters); } } diff --git a/osu.Game/Graphics/UserInterface/LineGraph.cs b/osu.Game/Graphics/UserInterface/LineGraph.cs index b135d8004d..cd8ba96dc8 100644 --- a/osu.Game/Graphics/UserInterface/LineGraph.cs +++ b/osu.Game/Graphics/UserInterface/LineGraph.cs @@ -59,10 +59,7 @@ namespace osu.Game.Graphics.UserInterface { Masking = true, RelativeSizeAxes = Axes.Both, - Children = new[] - { - path = new Path { RelativeSizeAxes = Axes.Both, PathWidth = 1 } - } + Child = path = new Path { RelativeSizeAxes = Axes.Both, PathWidth = 1 } }); } diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs index 3cc0e5bdb7..61da9560dc 100644 --- a/osu.Game/Overlays/Profile/ProfileHeader.cs +++ b/osu.Game/Overlays/Profile/ProfileHeader.cs @@ -31,6 +31,7 @@ namespace osu.Game.Overlays.Profile private readonly Box colourBar; private const float cover_height = 350, info_height = 150, info_width = 220, avatar_size = 110, level_position = 30, level_height = 60; + public ProfileHeader(User user) { RelativeSizeAxes = Axes.X; @@ -414,7 +415,8 @@ namespace osu.Game.Overlays.Profile private void tryAddInfoRightLine(FontAwesome icon, string str) { if (string.IsNullOrEmpty(str)) return; - infoTextRight.AddTextAwesome(icon); + + infoTextRight.AddIcon(icon); infoTextRight.AddText(" " + str); infoTextRight.NewLine(); } @@ -428,10 +430,7 @@ namespace osu.Game.Overlays.Profile public int DisplayCount { - set - { - numberText.Text = value.ToString(@"#,0"); - } + set { numberText.Text = value.ToString(@"#,0"); } } public GradeBadge(string grade) diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs index 854382c5d5..2cf049dd89 100644 --- a/osu.Game/Overlays/UserProfileOverlay.cs +++ b/osu.Game/Overlays/UserProfileOverlay.cs @@ -31,7 +31,6 @@ namespace osu.Game.Overlays private ProfileTabControl tabs; public const float CONTENT_X_MARGIN = 50; - private const float transition_length = 500; public UserProfileOverlay() {