From 2a3479f30d845c1294fe3214da9fd4938da7f3f4 Mon Sep 17 00:00:00 2001 From: Gagah Pangeran Rosfatiputra Date: Fri, 30 Apr 2021 10:47:51 +0700 Subject: [PATCH] add order in OsuMarkdownListItem for ordered list --- .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs | 2 +- .../Graphics/Containers/Markdown/OsuMarkdownListItem.cs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs index 1db47d6978..b765378e4c 100644 --- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs +++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs @@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers.Markdown Padding = new MarginPadding(0) }; - protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(level); + protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(level, listItemBlock.Order); protected override MarkdownPipeline CreateBuilder() => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub) diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs index 7b7cb5837c..361e503cd4 100644 --- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs +++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs @@ -12,6 +12,8 @@ namespace osu.Game.Graphics.Containers.Markdown public class OsuMarkdownListItem : CompositeDrawable { private readonly int level; + private readonly int order; + private readonly bool isOrdered; private const float default_left_padding = 20; [Resolved] @@ -19,9 +21,11 @@ namespace osu.Game.Graphics.Containers.Markdown public FillFlowContainer Content { get; } - public OsuMarkdownListItem(int level) + public OsuMarkdownListItem(int level, int order) { this.level = level; + this.order = order; + isOrdered = order != 0; AutoSizeAxes = Axes.Y; RelativeSizeAxes = Axes.X;