h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 05:53:10 +08:00
Code Issues Releases Wiki Activity

Simplify/rename SimpleStatisticRow mess

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-08-27 20:30:57 +02:00
parent ce013ac9b4
commit ea1f07e311
3 changed files with 6 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tests/Visual/Ranking/TestSceneDrawableSimpleStatisticRow.cs → osu.Game.Tests/Visual/Ranking/TestSceneSimpleStatisticTable.cs
View File

@ -13,7 +13,7 @@ using osu.Game.Screens.Ranking.Statistics;
namespace osu.Game.Tests.Visual.Ranking namespace osu.Game.Tests.Visual.Ranking
{ {
public class TestSceneDrawableSimpleStatisticRow : OsuTestScene public class TestSceneSimpleStatisticTable : OsuTestScene
{ {
private Container container; private Container container;
@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Ranking
public void TestEmpty() public void TestEmpty()
{ {
AddStep("create with no items", AddStep("create with no items",
() => container.Add(new DrawableSimpleStatisticRow(2, Enumerable.Empty<SimpleStatisticItem>()))); () => container.Add(new SimpleStatisticTable(2, Enumerable.Empty<SimpleStatisticItem>())));
} }
[Test] [Test]
@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual.Ranking
Value = RNG.Next(100) Value = RNG.Next(100)
}); });
container.Add(new DrawableSimpleStatisticRow(columnCount, items)); container.Add(new SimpleStatisticTable(columnCount, items));
}); });
} }
} }

34
osu.Game/Screens/Ranking/Statistics/SimpleStatisticRow.cs
View File

@ -1,34 +0,0 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using JetBrains.Annotations;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
namespace osu.Game.Screens.Ranking.Statistics
{
/// <summary>
/// Contains textual statistic data to display in a <see cref="DrawableSimpleStatisticRow"/>.
/// </summary>
public class SimpleStatisticRow
{
/// <summary>
/// The number of columns to layout the <see cref="Items"/> in.
/// </summary>
public int Columns { get; set; }
/// <summary>
/// The <see cref="StatisticItem"/>s that this row should contain.
/// </summary>
[ItemNotNull]
public SimpleStatisticItem[] Items { get; set; }
public Drawable CreateDrawableStatisticRow() => new Container
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding(20),
Child = new DrawableSimpleStatisticRow(Columns, Items)
};
}
}

6
osu.Game/Screens/Ranking/Statistics/DrawableSimpleStatisticRow.cs → osu.Game/Screens/Ranking/Statistics/SimpleStatisticTable.cs
View File

@ -14,10 +14,10 @@ using osu.Framework.Graphics.Shapes;
namespace osu.Game.Screens.Ranking.Statistics namespace osu.Game.Screens.Ranking.Statistics
{ {
/// <summary> /// <summary>
/// Represents a statistic row with simple statistics (ones that only need textual display). /// Represents a table with simple statistics (ones that only need textual display).
/// Richer visualisations should be done with <see cref="StatisticRow"/>s and <see cref="StatisticItem"/>s. /// Richer visualisations should be done with <see cref="StatisticRow"/>s and <see cref="StatisticItem"/>s.
/// </summary> /// </summary>
public class DrawableSimpleStatisticRow : CompositeDrawable public class SimpleStatisticTable : CompositeDrawable
{ {
private readonly SimpleStatisticItem[] items; private readonly SimpleStatisticItem[] items;
private readonly int columnCount; private readonly int columnCount;
@ -29,7 +29,7 @@ namespace osu.Game.Screens.Ranking.Statistics
/// </summary> /// </summary>
/// <param name="columnCount">The number of columns to layout the <paramref name="items"/> into.</param> /// <param name="columnCount">The number of columns to layout the <paramref name="items"/> into.</param>
/// <param name="items">The <see cref="SimpleStatisticItem"/>s to display in this row.</param> /// <param name="items">The <see cref="SimpleStatisticItem"/>s to display in this row.</param>
public DrawableSimpleStatisticRow(int columnCount, [ItemNotNull] IEnumerable<SimpleStatisticItem> items) public SimpleStatisticTable(int columnCount, [ItemNotNull] IEnumerable<SimpleStatisticItem> items)
{ {
if (columnCount < 1) if (columnCount < 1)
throw new ArgumentOutOfRangeException(nameof(columnCount)); throw new ArgumentOutOfRangeException(nameof(columnCount));