1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 18:52:55 +08:00

Don't use repetitive headers in each class

This commit is contained in:
Andrei Zavatski 2019-11-27 21:46:41 +03:00
parent 4cf5968026
commit 2135a7fd7b
4 changed files with 11 additions and 11 deletions

View File

@ -19,10 +19,8 @@ namespace osu.Game.Overlays.Rankings.Tables
{ {
} }
protected override TableColumn[] CreateHeaders() => new[] protected override TableColumn[] CreateAdditionalHeaders() => new[]
{ {
new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.Absolute, 50)), // place
new TableColumn(string.Empty, Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed)), // flag and country name
new TableColumn("Active Users", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)), new TableColumn("Active Users", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
new TableColumn("Play Count", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)), new TableColumn("Play Count", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
new TableColumn("Ranked Score", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)), new TableColumn("Ranked Score", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),

View File

@ -20,10 +20,8 @@ namespace osu.Game.Overlays.Rankings.Tables
{ {
} }
protected override TableColumn[] CreateHeaders() => new[] protected override TableColumn[] CreateAdditionalHeaders() => new[]
{ {
new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.Absolute, 50)), // place
new TableColumn(string.Empty, Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed)), // flag and username
new TableColumn("Accuracy", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)), new TableColumn("Accuracy", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
new TableColumn("Play Count", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)), new TableColumn("Play Count", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
new TableColumn("Performance", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)), new TableColumn("Performance", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),

View File

@ -53,12 +53,18 @@ namespace osu.Game.Overlays.Rankings.Tables
value.ForEach(_ => backgroundFlow.Add(new TableRowBackground())); value.ForEach(_ => backgroundFlow.Add(new TableRowBackground()));
Columns = CreateHeaders(); Columns = mainHeaders.Concat(CreateAdditionalHeaders()).ToArray();
Content = value.Select((s, i) => CreateContent((page - 1) * items_per_page + i, s)).ToArray().ToRectangular(); Content = value.Select((s, i) => CreateContent((page - 1) * items_per_page + i, s)).ToArray().ToRectangular();
} }
} }
protected abstract TableColumn[] CreateHeaders(); private static TableColumn[] mainHeaders => new[]
{
new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.Absolute, 50)), // place
new TableColumn(string.Empty, Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed)), // flag and username (country name)
};
protected abstract TableColumn[] CreateAdditionalHeaders();
protected abstract Drawable[] CreateContent(int index, TModel item); protected abstract Drawable[] CreateContent(int index, TModel item);

View File

@ -20,10 +20,8 @@ namespace osu.Game.Overlays.Rankings.Tables
{ {
} }
protected override TableColumn[] CreateHeaders() => new[] protected override TableColumn[] CreateAdditionalHeaders() => new[]
{ {
new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.Absolute, 50)), // place
new TableColumn(string.Empty, Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed)), // flag and username
new TableColumn("Accuracy", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)), new TableColumn("Accuracy", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
new TableColumn("Play Count", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)), new TableColumn("Play Count", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
new TableColumn("Total Score", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)), new TableColumn("Total Score", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),