Merge branch 'markdown-link' into markdown-wiki

This commit is contained in:
Gagah Pangeran Rosfatiputra 2021-05-26 14:55:32 +07:00
commit 02f0e2f212
No known key found for this signature in database
GPG Key ID: 25F6F17FD29031E2
2 changed files with 16 additions and 11 deletions

View File

@ -23,10 +23,14 @@ namespace osu.Game.Graphics.Containers.Markdown
LineSpacing = 21;
}
[BackgroundDependencyLoader]
private void load(IAPIProvider api)
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
var api = parent.Get<IAPIProvider>();
// needs to be set before the base BDL call executes to avoid invalidating any already populated markdown content.
DocumentUrl = api.WebsiteRootUrl;
return base.CreateChildDependencies(parent);
}
protected override void AddMarkdownComponent(IMarkdownObject markdownObject, FillFlowContainer container, int level)

View File

@ -16,28 +16,29 @@ namespace osu.Game.Graphics.Containers.Markdown
[Resolved(canBeNull: true)]
private OsuGame game { get; set; }
protected string Text;
protected string Title;
private readonly string text;
private readonly string title;
public OsuMarkdownLinkText(string text, LinkInline linkInline)
: base(text, linkInline)
{
Text = text;
Title = linkInline.Title;
this.text = text;
title = linkInline.Title;
}
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
private void load()
{
var text = CreateSpriteText().With(t => t.Text = Text);
var textDrawable = CreateSpriteText().With(t => t.Text = text);
InternalChildren = new Drawable[]
{
text,
new OsuMarkdownLinkCompiler(new[] { text })
textDrawable,
new OsuMarkdownLinkCompiler(new[] { textDrawable })
{
RelativeSizeAxes = Axes.Both,
Action = OnLinkPressed,
TooltipText = Title ?? Url,
TooltipText = title ?? Url,
}
};
}