sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-17 03:27:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

add some missing stuff

Browse Source
This commit is contained in:
jorolf 2018-12-22 22:31:11 +01:00
parent 2fe80d5568
commit da99161736
3 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Graphics/UserInterface/LineGraph.cs
View File

@ -111,7 +111,6 @@ namespace osu.Game.Graphics.UserInterface
{ {
float x = (i + count - values.Length) / (float)(count - 1) * DrawWidth - 1; float x = (i + count - values.Length) / (float)(count - 1) * DrawWidth - 1;
float y = GetYPosition(values[i]) * DrawHeight - path.PathWidth; float y = GetYPosition(values[i]) * DrawHeight - path.PathWidth;
// the -1 is for inner offset in path (actually -PathWidth)
path.AddVertex(new Vector2(x, y)); path.AddVertex(new Vector2(x, y));
} }
} }

1
osu.Game/Overlays/Profile/Header/SupporterIcon.cs
View File

@ -7,7 +7,6 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics; using osu.Game.Graphics;
using osuTK;
namespace osu.Game.Overlays.Profile.Header namespace osu.Game.Overlays.Profile.Header
{ {

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

@ -3,6 +3,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Framework.Extensions; using osu.Framework.Extensions;
@ -39,6 +40,7 @@ namespace osu.Game.Overlays.Profile
private readonly Box headerTopBox; private readonly Box headerTopBox;
private readonly UpdateableAvatar avatar; private readonly UpdateableAvatar avatar;
private readonly OsuSpriteText usernameText; private readonly OsuSpriteText usernameText;
private readonly ExternalLinkButton openUserExternally;
private readonly OsuSpriteText titleText; private readonly OsuSpriteText titleText;
private readonly DrawableFlag userFlag; private readonly DrawableFlag userFlag;
private readonly OsuSpriteText userCountryText; private readonly OsuSpriteText userCountryText;
@ -76,6 +78,13 @@ namespace osu.Game.Overlays.Profile
private const float cover_height = 150; private const float cover_height = 150;
private const float cover_info_height = 75; private const float cover_info_height = 75;
private const float avatar_size = 110; private const float avatar_size = 110;
private static readonly Dictionary<string, string> play_styles = new Dictionary<string, string>
{
{"keyboard", "Keyboard"},
{"mouse", "Mouse"},
{"tablet", "Tablet"},
{"touch", "Touch Screen"},
};
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private ChannelManager channelManager { get; set; } private ChannelManager channelManager { get; set; }
@ -195,10 +204,24 @@ namespace osu.Game.Overlays.Profile
Padding = new MarginPadding { Left = 10 }, Padding = new MarginPadding { Left = 10 },
Children = new Drawable[] Children = new Drawable[]
{ {
usernameText = new OsuSpriteText new FillFlowContainer
{ {
Font = "Exo2.0-Regular", AutoSizeAxes = Axes.Both,
TextSize = 24 Direction = FillDirection.Horizontal,
Children = new Drawable[]
{
usernameText = new OsuSpriteText
{
Font = "Exo2.0-Regular",
TextSize = 24
},
openUserExternally = new ExternalLinkButton
{
Margin = new MarginPadding { Left = 5 },
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
},
}
}, },
new FillFlowContainer new FillFlowContainer
{ {
@ -694,6 +717,7 @@ namespace osu.Game.Overlays.Profile
avatar.User = User; avatar.User = User;
usernameText.Text = user.Username; usernameText.Text = user.Username;
openUserExternally.Link = $@"https://osu.ppy.sh/users/{user.Id}";
userFlag.Country = user.Country; userFlag.Country = user.Country;
userCountryText.Text = user.Country?.FullName; userCountryText.Text = user.Country?.FullName;
SupporterTag.SupporterLevel = user.SupportLevel; SupporterTag.SupporterLevel = user.SupportLevel;
@ -796,16 +820,24 @@ namespace osu.Game.Overlays.Profile
addSpacer(bottomTopLinkContainer); addSpacer(bottomTopLinkContainer);
if (user.PlayStyle?.Length > 0)
{
bottomTopLinkContainer.AddText("Plays with ");
bottomTopLinkContainer.AddText(string.Join(", ", user.PlayStyle.Select(style => play_styles[style])), bold);
addSpacer(bottomTopLinkContainer);
}
if (user.LastVisit.HasValue) if (user.LastVisit.HasValue)
{ {
bottomTopLinkContainer.AddText("Last seen "); bottomTopLinkContainer.AddText("Last seen ");
bottomTopLinkContainer.AddText(new DrawableDate(user.LastVisit.Value), bold); bottomTopLinkContainer.AddText(new DrawableDate(user.LastVisit.Value), bold);
addSpacer(bottomTopLinkContainer);
} }
addSpacer(bottomTopLinkContainer);
bottomTopLinkContainer.AddText("Contributed "); bottomTopLinkContainer.AddText("Contributed ");
bottomTopLinkContainer.AddLink($@"{user.PostCount} forum posts", $"https://osu.ppy.sh/users/{user.Id}/posts", creationParameters: bold); bottomTopLinkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"https://osu.ppy.sh/users/{user.Id}/posts", creationParameters: bold);
void tryAddInfo(FontAwesome icon, string content, string link = null) void tryAddInfo(FontAwesome icon, string content, string link = null)
{ {