h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 09:58:21 +08:00
Code Issues Releases Wiki Activity

Integrate score panel list into results screen

Browse Source
This commit is contained in:
smoogipoo 2020-05-20 23:46:54 +09:00
parent 1b8d657ead
commit acba1f3ad6
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game/Screens/Ranking/ResultsScreen.cs
View File

@ -46,7 +46,7 @@ namespace osu.Game.Screens.Ranking
private readonly bool allowRetry; private readonly bool allowRetry;
private Drawable bottomPanel; private Drawable bottomPanel;
private Container<ScorePanel> contractedPanels; private ScorePanelList panels;
public ResultsScreen(ScoreInfo score, bool allowRetry = true) public ResultsScreen(ScoreInfo score, bool allowRetry = true)
{ {
@ -63,28 +63,9 @@ namespace osu.Game.Screens.Ranking
{ {
new ResultsScrollContainer new ResultsScrollContainer
{ {
Children = new Drawable[] Child = panels = new ScorePanelList
{ {
new ScorePanel(Score) RelativeSizeAxes = Axes.Both,
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
State = PanelState.Expanded
},
new OsuScrollContainer(Direction.Horizontal)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
ScrollbarVisible = false,
Child = contractedPanels = new FillFlowContainer<ScorePanel>
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Direction = FillDirection.Horizontal,
AutoSizeAxes = Axes.Both
}
}
} }
}, },
bottomPanel = new Container bottomPanel = new Container
@ -117,6 +98,8 @@ namespace osu.Game.Screens.Ranking
} }
}; };
panels.AddScore(Score);
if (player != null && allowRetry) if (player != null && allowRetry)
{ {
buttons.Add(new RetryButton { Width = 300 }); buttons.Add(new RetryButton { Width = 300 });
@ -141,12 +124,13 @@ namespace osu.Game.Screens.Ranking
req.Success += r => req.Success += r =>
{ {
contractedPanels.ChildrenEnumerable = r.Scores.Select(s => s.CreateScoreInfo(rulesets)).Select(s => new ScorePanel(s) foreach (var s in r.Scores.Select(s => s.CreateScoreInfo(rulesets)))
{ {
Anchor = Anchor.CentreLeft, if (s.OnlineScoreID == Score.OnlineScoreID)
Origin = Anchor.CentreLeft, continue;
State = PanelState.Contracted
}); panels.AddScore(s);
}
}; };
api.Queue(req); api.Queue(req);