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

Refactor populateStatistics to avoid disposing

Browse Source
This commit is contained in:
Henry Lin 2022-02-03 11:52:37 +08:00
parent 19eb9ad8a7
commit aff36d4e16
1 changed files with 63 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
osu.Game/Screens/Ranking/Statistics/StatisticsPanel.cs
View File

@ -86,88 +86,86 @@ namespace osu.Game.Screens.Ranking.Statistics
playableBeatmap = beatmapManager.GetWorkingBeatmap(newScore.BeatmapInfo).GetPlayableBeatmap(newScore.Ruleset, newScore.Mods); playableBeatmap = beatmapManager.GetWorkingBeatmap(newScore.BeatmapInfo).GetPlayableBeatmap(newScore.Ruleset, newScore.Mods);
}, loadCancellation.Token).ContinueWith(t => Schedule(() => }, loadCancellation.Token).ContinueWith(t => Schedule(() =>
{ {
FillFlowContainer rows;
Container<Drawable> container = new OsuScrollContainer(Direction.Vertical)
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Alpha = 0,
Children = new[]
{
rows = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Spacing = new Vector2(30, 15)
}
}
};
bool panelIsEmpty = true;
bool panelIsComplete = true;
bool hitEventsAvailable = newScore.HitEvents.Count != 0; bool hitEventsAvailable = newScore.HitEvents.Count != 0;
Container<Drawable> container;
foreach (var row in newScore.Ruleset.CreateInstance().CreateStatisticsForScore(newScore, playableBeatmap)) var statisticRows = newScore.Ruleset.CreateInstance().CreateStatisticsForScore(newScore, playableBeatmap);
if (!hitEventsAvailable && statisticRows.SelectMany(r => r.Columns).All(c => c.RequiresHitEvents))
{ {
var columnsToDisplay = hitEventsAvailable container = new FillFlowContainer
? row.Columns
: row.Columns.Where(c => !c.RequiresHitEvents).ToArray();
if (columnsToDisplay.Length < row.Columns.Length)
panelIsComplete = false;
if (columnsToDisplay.Any())
panelIsEmpty = false;
else
continue;
rows.Add(new GridContainer
{ {
Anchor = Anchor.TopCentre, RelativeSizeAxes = Axes.Both,
Origin = Anchor.TopCentre, Anchor = Anchor.Centre,
RelativeSizeAxes = Axes.X, Origin = Anchor.Centre,
AutoSizeAxes = Axes.Y, Direction = FillDirection.Vertical,
Content = new[] Children = new Drawable[]
{ {
columnsToDisplay?.Select(c => new StatisticContainer(c) new MessagePlaceholder("Extended statistics are only available after watching a replay!"),
new ReplayDownloadButton(newScore)
{ {
Scale = new Vector2(1.5f),
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
}).Cast<Drawable>().ToArray() },
}, }
ColumnDimensions = Enumerable.Range(0, columnsToDisplay.Length) };
.Select(i => columnsToDisplay[i].Dimension ?? new Dimension()).ToArray(),
RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
});
} }
else
if (!hitEventsAvailable)
{ {
if (panelIsEmpty) FillFlowContainer rows;
container = new OsuScrollContainer(Direction.Vertical)
{ {
// Replace the scroll container with fill flow container to get the message centered. RelativeSizeAxes = Axes.Both,
rows.Dispose(); Anchor = Anchor.Centre,
container.Dispose(); Origin = Anchor.Centre,
container = new FillFlowContainer Alpha = 0,
Children = new[]
{ {
RelativeSizeAxes = Axes.Both, rows = new FillFlowContainer
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Direction = FillDirection.Vertical,
Children = new Drawable[]
{ {
new MessagePlaceholder("Extended statistics are only available after watching a replay!"), RelativeSizeAxes = Axes.X,
new ReplayDownloadButton(newScore) AutoSizeAxes = Axes.Y,
Spacing = new Vector2(30, 15)
}
}
};
bool panelIsComplete = true;
foreach (var row in statisticRows)
{
var columnsToDisplay = hitEventsAvailable
? row.Columns
: row.Columns.Where(c => !c.RequiresHitEvents).ToArray();
if (columnsToDisplay.Length < row.Columns.Length)
panelIsComplete = false;
if (columnsToDisplay.Length == 0)
continue;
rows.Add(new GridContainer
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Content = new[]
{
columnsToDisplay?.Select(c => new StatisticContainer(c)
{ {
Scale = new Vector2(1.5f),
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
}, }).Cast<Drawable>().ToArray()
} },
}; ColumnDimensions = Enumerable.Range(0, columnsToDisplay.Length)
.Select(i => columnsToDisplay[i].Dimension ?? new Dimension()).ToArray(),
RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
});
} }
else if (!panelIsComplete)
if (!hitEventsAvailable && !panelIsComplete)
{ {
rows.Add(new FillFlowContainer rows.Add(new FillFlowContainer
{ {