From 77c94afcf182ff33a893ed3d3930f9cb04e3b344 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 14:28:10 +0900
Subject: [PATCH] Add better flow logic to map pool layout when few beatmaps
 are present

---
 .../Screens/MapPool/MapPoolScreen.cs          | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index c42d0a6da3..d7aeac02cb 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -47,9 +47,10 @@ namespace osu.Game.Tournament.Screens.MapPool
                 {
                     Y = 100,
                     Spacing = new Vector2(10, 10),
-                    Padding = new MarginPadding(25),
+                    Padding = new MarginPadding(5) { Horizontal = 100 },
                     Direction = FillDirection.Vertical,
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
                 },
                 new ControlPanel
                 {
@@ -90,6 +91,7 @@ namespace osu.Game.Tournament.Screens.MapPool
                             Text = "Reset",
                             Action = reset
                         },
+                        new ControlPanel.Spacer(),
                     }
                 }
             };
@@ -206,11 +208,15 @@ namespace osu.Game.Tournament.Screens.MapPool
         {
             mapFlows.Clear();
 
+            int totalRows = 0;
+
             if (match.NewValue.Round.Value != null)
             {
                 FillFlowContainer<TournamentBeatmapPanel> currentFlow = null;
                 string currentMod = null;
 
+                int flowCount = 0;
+
                 foreach (var b in match.NewValue.Round.Value.Beatmaps)
                 {
                     if (currentFlow == null || currentMod != b.Mods)
@@ -224,6 +230,15 @@ namespace osu.Game.Tournament.Screens.MapPool
                         });
 
                         currentMod = b.Mods;
+
+                        totalRows++;
+                        flowCount = 0;
+                    }
+
+                    if (++flowCount > 2)
+                    {
+                        totalRows++;
+                        flowCount = 0;
                     }
 
                     currentFlow.Add(new TournamentBeatmapPanel(b.BeatmapInfo, b.Mods)
@@ -233,6 +248,10 @@ namespace osu.Game.Tournament.Screens.MapPool
                     });
                 }
             }
+
+            if (totalRows > 8)
+                // remove horizontal padding to increase flow width to 3 panels
+                mapFlows.Padding = new MarginPadding(5);
         }
     }
 }