sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-05 12:57:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Group map pool by mod type

Browse Source
This commit is contained in:
Dean Herbert 2018-11-17 16:06:43 +09:00
parent 4ae9413ee6
commit 852f0337dd
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Tournament.Screens.MapPool
{ {
public class MapPoolScreen : TournamentScreen public class MapPoolScreen : TournamentScreen
{ {
private readonly FillFlowContainer<TournamentBeatmapPanel> maps; private readonly FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>> mapFlows;
private readonly Bindable<MatchPairing> currentMatch = new Bindable<MatchPairing>(); private readonly Bindable<MatchPairing> currentMatch = new Bindable<MatchPairing>();
@ -39,12 +39,12 @@ namespace osu.Game.Tournament.Screens.MapPool
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new MatchHeader(), new MatchHeader(),
maps = new FillFlowContainer<TournamentBeatmapPanel> mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
{ {
Y = 100, Y = 100,
Spacing = new Vector2(10, 20), Spacing = new Vector2(10, 20),
Padding = new MarginPadding(50), Padding = new MarginPadding(50),
Direction = FillDirection.Full, Direction = FillDirection.Vertical,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
}, },
new ControlPanel new ControlPanel
@ -136,7 +136,9 @@ namespace osu.Game.Tournament.Screens.MapPool
protected override bool OnMouseDown(MouseDownEvent e) protected override bool OnMouseDown(MouseDownEvent e)
{ {
var map = maps.FirstOrDefault(m => m.ReceivePositionalInputAt(e.ScreenSpaceMousePosition)); var maps = mapFlows.Select(f => f.FirstOrDefault(m => m.ReceivePositionalInputAt(e.ScreenSpaceMousePosition)));
var map = maps.FirstOrDefault(m => m != null);
if (map != null) if (map != null)
{ {
if (e.Button == MouseButton.Left && map.Beatmap.OnlineBeatmapID != null) if (e.Button == MouseButton.Left && map.Beatmap.OnlineBeatmapID != null)
@ -188,16 +190,34 @@ namespace osu.Game.Tournament.Screens.MapPool
private void matchChanged(MatchPairing match) private void matchChanged(MatchPairing match)
{ {
maps.Clear(); mapFlows.Clear();
if (match.Grouping.Value != null) if (match.Grouping.Value != null)
{ {
FillFlowContainer<TournamentBeatmapPanel> currentFlow = null;
string currentMod = null;
foreach (var b in match.Grouping.Value.Beatmaps) foreach (var b in match.Grouping.Value.Beatmaps)
maps.Add(new TournamentBeatmapPanel(b.BeatmapInfo, b.Mods) {
if (currentFlow == null || currentMod != b.Mods)
{
mapFlows.Add(currentFlow = new FillFlowContainer<TournamentBeatmapPanel>
{
Spacing = new Vector2(10, 20),
Direction = FillDirection.Full,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y
});
currentMod = b.Mods;
}
currentFlow.Add(new TournamentBeatmapPanel(b.BeatmapInfo, b.Mods)
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
}); });
}
} }
} }
} }