From 0c95dff3d690bd73dccf74f7ccdcdf45d1b275ea Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Mon, 1 Jul 2019 18:41:08 +0300
Subject: [PATCH] Make FlowContainer insertion cleaner

---
 .../Changelog/ChangelogSingleBuild.cs         | 24 +++++++------------
 osu.Game/Overlays/Music/PlaylistList.cs       |  5 +---
 .../Profile/Header/MedalHeaderContainer.cs    |  4 +---
 .../Sections/Ranks/DrawableProfileScore.cs    |  3 +--
 osu.Game/Overlays/Settings/SettingsItem.cs    |  3 +--
 5 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs b/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
index 36ae5a756c..fdd3d6d555 100644
--- a/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
@@ -88,24 +88,16 @@ namespace osu.Game.Overlays.Changelog
                     });
                 }
 
-                NavigationIconButton left, right;
-
-                fill.AddRange(new[]
+                fill.Insert(-1, new NavigationIconButton(Build.Versions?.Previous)
                 {
-                    left = new NavigationIconButton(Build.Versions?.Previous)
-                    {
-                        Icon = FontAwesome.Solid.ChevronLeft,
-                        SelectBuild = b => SelectBuild(b)
-                    },
-                    right = new NavigationIconButton(Build.Versions?.Next)
-                    {
-                        Icon = FontAwesome.Solid.ChevronRight,
-                        SelectBuild = b => SelectBuild(b)
-                    },
+                    Icon = FontAwesome.Solid.ChevronLeft,
+                    SelectBuild = b => SelectBuild(b)
+                });
+                fill.Insert(1, new NavigationIconButton(Build.Versions?.Next)
+                {
+                    Icon = FontAwesome.Solid.ChevronRight,
+                    SelectBuild = b => SelectBuild(b)
                 });
-
-                fill.SetLayoutPosition(left, -1);
-                fill.SetLayoutPosition(right, 1);
 
                 return fill;
             }
diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs
index 07040f166d..539601c359 100644
--- a/osu.Game/Overlays/Music/PlaylistList.cs
+++ b/osu.Game/Overlays/Music/PlaylistList.cs
@@ -85,10 +85,7 @@ namespace osu.Game.Overlays.Music
 
             private void addBeatmapSet(BeatmapSetInfo obj) => Schedule(() =>
             {
-                var newItem = new PlaylistItem(obj) { OnSelect = set => Selected?.Invoke(set) };
-
-                items.Add(newItem);
-                items.SetLayoutPosition(newItem, items.Count - 1);
+                items.Insert(items.Count - 1, new PlaylistItem(obj) { OnSelect = set => Selected?.Invoke(set) });
             });
 
             private void removeBeatmapSet(BeatmapSetInfo obj) => Schedule(() =>
diff --git a/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
index 67229a80c0..45bc60f794 100644
--- a/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
@@ -78,10 +78,8 @@ namespace osu.Game.Overlays.Profile.Header
                     int displayIndex = index;
                     LoadComponentAsync(new DrawableBadge(badges[index]), asyncBadge =>
                     {
-                        badgeFlowContainer.Add(asyncBadge);
-
                         // load in stable order regardless of async load order.
-                        badgeFlowContainer.SetLayoutPosition(asyncBadge, displayIndex);
+                        badgeFlowContainer.Insert(displayIndex, asyncBadge);
                     });
                 }
             }
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 0a90c9b135..b77357edd8 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -49,8 +49,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                 Font = OsuFont.GetFont(size: 11, weight: FontWeight.Regular, italics: true)
             };
 
-            RightFlowContainer.Add(text);
-            RightFlowContainer.SetLayoutPosition(text, 1);
+            RightFlowContainer.Insert(1, text);
 
             LeftFlowContainer.Add(new BeatmapMetadataContainer(Score.Beatmap));
             LeftFlowContainer.Add(new DrawableDate(Score.Date));
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index ae840c8c00..d48c0b6b66 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -46,8 +46,7 @@ namespace osu.Game.Overlays.Settings
                 if (text == null)
                 {
                     // construct lazily for cases where the label is not needed (may be provided by the Control).
-                    Add(text = new OsuSpriteText());
-                    FlowContent.SetLayoutPosition(text, -1);
+                    FlowContent.Insert(-1, text = new OsuSpriteText());
                 }
 
                 text.Text = value;