RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into rankings-scope-selector

This commit is contained in:
Dean Herbert 2019-09-13 14:07:39 +09:00
parent 0e679fb468 4c76ec416a
commit 43d7615734
5 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Online/Leaderboards/LeaderboardScore.cs
View File

@ -215,6 +215,7 @@ private void load()
Origin = Anchor.BottomRight,
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(1),
ChildrenEnumerable = score.Mods.Select(mod => new ModIcon(mod) { Scale = new Vector2(0.375f) })
},
},

1
osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
View File

@ -171,6 +171,7 @@ private Drawable[] createContent(int index, ScoreInfo score)
{
Direction = FillDirection.Horizontal,
AutoSizeAxes = Axes.Both,
Spacing = new Vector2(1),
ChildrenEnumerable = score.Mods.Select(m => new ModIcon(m)
{
AutoSizeAxes = Axes.Both,

3
osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
View File

@ -172,7 +172,8 @@ public ModsInfoColumn()
: this(new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal
Direction = FillDirection.Horizontal,
Spacing = new Vector2(1),
})
{
}

9
osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
View File

@ -12,12 +12,13 @@
using osu.Game.Scoring;
using osu.Game.Beatmaps;
using osu.Framework.Localisation;
using osu.Framework.Graphics.Containers;
namespace osu.Game.Overlays.Profile.Sections.Ranks
{
public abstract class DrawableProfileScore : DrawableProfileRow
{
private readonly ScoreModsContainer modsContainer;
private readonly FillFlowContainer modsContainer;
protected readonly ScoreInfo Score;
protected DrawableProfileScore(ScoreInfo score)
@ -28,12 +29,12 @@ protected DrawableProfileScore(ScoreInfo score)
Height = 60;
Children = new Drawable[]
{
modsContainer = new ScoreModsContainer
modsContainer = new FillFlowContainer
{
AutoSizeAxes = Axes.Y,
AutoSizeAxes = Axes.Both,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Width = 60,
Spacing = new Vector2(1),
Margin = new MarginPadding { Right = 160 }
}
};

21
osu.Game/Overlays/Profile/Sections/Ranks/ScoreModsContainer.cs
View File

@ -1,21 +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 osuTK;
using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.UI;
using System.Collections.Generic;
using System.Linq;
namespace osu.Game.Overlays.Profile.Sections.Ranks
{
public class ScoreModsContainer : FlowContainer<ModIcon>
{
protected override IEnumerable<Vector2> ComputeLayoutPositions()
{
int count = FlowingChildren.Count();
for (int i = 0; i < count; i++)
yield return new Vector2(DrawWidth * i * (count == 1 ? 0 : 1f / (count - 1)), 0);
}
}
}