h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:02:55 +08:00
Code Issues Releases Wiki Activity

Linkify everything

Browse Source
This commit is contained in:
smoogipoo 2018-12-20 20:03:39 +09:00
parent f8d25a1b6c
commit 6a76e335c7
4 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
osu.Game/Screens/Multi/Components/BeatmapTitle.cs
View File

@ -6,36 +6,38 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Localisation;
using osu.Game.Beatmaps;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
namespace osu.Game.Screens.Multi.Components
{
public class BeatmapTitle : CompositeDrawable
{
private readonly OsuSpriteText beatmapTitle, beatmapDash, beatmapArtist;
private float textSize = OsuSpriteText.FONT_SIZE;
public float TextSize
{
set { beatmapTitle.TextSize = beatmapDash.TextSize = beatmapArtist.TextSize = value; }
get => textSize;
set
{
if (textSize == value)
return;
textSize = value;
updateText();
}
}
public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
private readonly LinkFlowContainer textFlow;
public BeatmapTitle()
{
AutoSizeAxes = Axes.Both;
InternalChild = new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Children = new[]
{
beatmapTitle = new OsuSpriteText { Font = @"Exo2.0-BoldItalic", },
beatmapDash = new OsuSpriteText { Font = @"Exo2.0-BoldItalic", },
beatmapArtist = new OsuSpriteText { Font = @"Exo2.0-RegularItalic", },
}
};
InternalChild = textFlow = new LinkFlowContainer { AutoSizeAxes = Axes.Both };
Beatmap.BindValueChanged(v => updateText());
}
@ -51,16 +53,30 @@ namespace osu.Game.Screens.Multi.Components
if (!IsLoaded)
return;
textFlow.Clear();
if (Beatmap.Value == null)
{
beatmapTitle.Text = "Changing map";
beatmapDash.Text = beatmapArtist.Text = string.Empty;
}
textFlow.AddText("Changing map", s => s.TextSize = TextSize);
else
{
beatmapTitle.Text = new LocalisedString((Beatmap.Value.Metadata.TitleUnicode, Beatmap.Value.Metadata.Title));
beatmapDash.Text = @" - ";
beatmapArtist.Text = new LocalisedString((Beatmap.Value.Metadata.ArtistUnicode, Beatmap.Value.Metadata.Artist));
textFlow.AddLink(new[]
{
new OsuSpriteText
{
Text = new LocalisedString((Beatmap.Value.Metadata.ArtistUnicode, Beatmap.Value.Metadata.Artist)),
TextSize = TextSize,
},
new OsuSpriteText
{
Text = " - ",
TextSize = TextSize,
},
new OsuSpriteText
{
Text = new LocalisedString((Beatmap.Value.Metadata.TitleUnicode, Beatmap.Value.Metadata.Title)),
TextSize = TextSize,
}
}, null, LinkAction.OpenBeatmap, Beatmap.Value.OnlineBeatmapID.ToString(), "Open beatmap");
}
}
}

26
osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
View File

@ -1,13 +1,13 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.Containers;
using osu.Game.Online.Chat;
using osu.Game.Online.Multiplayer;
using osuTK;
@ -15,8 +15,6 @@ namespace osu.Game.Screens.Multi.Components
{
public class BeatmapTypeInfo : CompositeDrawable
{
private readonly OsuSpriteText beatmapAuthor;
public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
public readonly IBindable<GameType> Type = new Bindable<GameType>();
@ -27,6 +25,7 @@ namespace osu.Game.Screens.Multi.Components
BeatmapTitle beatmapTitle;
ModeTypeInfo modeTypeInfo;
LinkFlowContainer beatmapAuthor;
InternalChild = new FillFlowContainer
{
@ -45,11 +44,11 @@ namespace osu.Game.Screens.Multi.Components
Children = new Drawable[]
{
beatmapTitle = new BeatmapTitle(),
beatmapAuthor = new OsuSpriteText
beatmapAuthor = new LinkFlowContainer(s => s.TextSize = 14)
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
TextSize = 14,
AutoSizeAxes = Axes.Both
},
},
},
@ -61,13 +60,16 @@ namespace osu.Game.Screens.Multi.Components
beatmapTitle.Beatmap.BindTo(Beatmap);
Beatmap.BindValueChanged(v => beatmapAuthor.Text = v == null ? string.Empty : $"mapped by {v.Metadata.Author}");
}
Beatmap.BindValueChanged(v =>
{
beatmapAuthor.Clear();
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
beatmapAuthor.Colour = colours.GrayC;
if (v != null)
{
beatmapAuthor.AddText("mapped by ", s => s.Colour = OsuColour.Gray(0.8f));
beatmapAuthor.AddLink(v.Metadata.Author.Username, null, LinkAction.OpenUserProfile, v.Metadata.Author.Id.ToString(), "View Profile");
}
});
}
}
}

1
osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
View File

@ -205,7 +205,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components
beatmapTitle = new BeatmapTitle
{
TextSize = 14,
Colour = colours.Gray9
},
}
}

2
osu.Game/Screens/Multi/Match/Components/HostInfo.cs
View File

@ -45,7 +45,7 @@ namespace osu.Game.Screens.Multi.Match.Components
linkContainer.AddText("hosted by");
linkContainer.NewLine();
linkContainer.AddLink(room.Host.Value.Username,null, LinkAction.OpenUserProfile, room.Host.Value.Id.ToString(), "Open profile", s => s.Font = "Exo2.0-BoldItalic");
linkContainer.AddLink(room.Host.Value.Username, null, LinkAction.OpenUserProfile, room.Host.Value.Id.ToString(), "View Profile", s => s.Font = "Exo2.0-BoldItalic");
}
}
}