Update framewörk

osu-framework

@@ -1 +1 @@
-Subproject commit 995e80742b289dbe1e7655c39148b1773876d52a
+Subproject commit f3aea04b0e6a6ebb6d6f24fcb2134058765c0df0

osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs

@@ -22,9 +22,9 @@ namespace osu.Desktop.VisualTests.Tests
         {
             base.Reset();
 
-            FlowContainer flow;
+            FillFlowContainer flow;
 
-            Add(flow = new FlowContainer()
+            Add(flow = new FillFlowContainer()
             {
                 RelativeSizeAxes = Axes.Both,
                 Size = new Vector2(0.5f),

osu.Desktop/Overlays/VersionManager.cs

@@ -57,16 +57,17 @@ namespace osu.Desktop.Overlays
 
             Children = new Drawable[]
             {
-                new FlowContainer
+                new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                    Direction = FlowDirection.Down,
                     Children = new Drawable[]
                     {
-                        new FlowContainer
+                        new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
-                            FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(5)),
+                            Direction = FlowDirection.Right,
+                            Spacing = new Vector2(5),
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             Children = new Drawable[]

osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs

@@ -13,7 +13,7 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Modes.Osu.Objects.Drawables
 {
-    public class HitExplosion : FlowContainer
+    public class HitExplosion : FillFlowContainer
     {
         private readonly OsuJudgementInfo judgement;
         private SpriteText line1;
@@ -25,7 +25,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             AutoSizeAxes = Axes.Both;
             Origin = Anchor.Centre;
 
-            FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 2));
+            Direction = FlowDirection.Down;
+            Spacing = new Vector2(0, 2);
             Position = (h?.StackedEndPosition ?? Vector2.Zero) + judgement.PositionOffset;
 
             Children = new Drawable[]

osu.Game/Beatmaps/Drawables/BeatmapGroup.cs

@@ -8,72 +8,6 @@ using osu.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Database;
 
-namespace osu.Game.Beatmaps.Drawables
-{
-    class BeatmapGroup : IStateful<BeatmapGroupState>
-    {
-        public BeatmapPanel SelectedPanel;
-
-        /// <summary>
-        /// Fires when one of our difficulties was selected. Will fire on first expand.
-        /// </summary>
-        public Action<BeatmapGroup, BeatmapInfo> SelectionChanged;
-
-        /// <summary>
-        /// Fires when one of our difficulties is clicked when already selected. Should start playing the map.
-        /// </summary>
-        public Action<BeatmapInfo> StartRequested;
-
-        public BeatmapSetHeader Header;
-
-        private BeatmapGroupState state;
-
-        public List<BeatmapPanel> BeatmapPanels;
-
-        public BeatmapSetInfo BeatmapSet;
-
-        public BeatmapGroupState State
-        {
-            get { return state; }
-            set
-            {
-                switch (value)
-                {
-                    case BeatmapGroupState.Expanded:
-                        Header.State = PanelSelectedState.Selected;
-                        foreach (BeatmapPanel panel in BeatmapPanels)
-                            panel.State = panel == SelectedPanel ? PanelSelectedState.Selected : PanelSelectedState.NotSelected;
-                        break;
-                    case BeatmapGroupState.Collapsed:
-                        Header.State = PanelSelectedState.NotSelected;
-                        foreach (BeatmapPanel panel in BeatmapPanels)
-                            panel.State = PanelSelectedState.Hidden;
-                        break;
-                    case BeatmapGroupState.Hidden:
-                        Header.State = PanelSelectedState.Hidden;
-                        foreach (BeatmapPanel panel in BeatmapPanels)
-                            panel.State = PanelSelectedState.Hidden;
-                        break;
-                }
-                state = value;
-            }
-        }
-
-        public BeatmapGroup(BeatmapSetInfo beatmapSet, BeatmapDatabase database)
-        {
-            BeatmapSet = beatmapSet;
-            WorkingBeatmap beatmap = database.GetWorkingBeatmap(BeatmapSet.Beatmaps.FirstOrDefault());
-            foreach (var b in BeatmapSet.Beatmaps)
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using osu.Framework;
-using osu.Framework.Graphics;
-using osu.Game.Database;
-
 namespace osu.Game.Beatmaps.Drawables
 {
     class BeatmapGroup : IStateful<BeatmapGroupState>

osu.Game/Beatmaps/Drawables/BeatmapPanel.cs

@@ -83,10 +83,10 @@ namespace osu.Game.Beatmaps.Drawables
                     ColourLight = OsuColour.FromHex(@"3a7285"),
                     ColourDark = OsuColour.FromHex(@"123744")
                 },
-                new FlowContainer
+                new FillFlowContainer
                 {
                     Padding = new MarginPadding(5),
-                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
+                    Direction = FlowDirection.Right,
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
@@ -98,16 +98,17 @@ namespace osu.Game.Beatmaps.Drawables
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                         },
-                        new FlowContainer
+                        new FillFlowContainer
                         {
                             Padding = new MarginPadding { Left = 5 },
-                            FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                            Direction = FlowDirection.Down,
                             AutoSizeAxes = Axes.Both,
                             Children = new Drawable[]
                             {
-                                new FlowContainer
+                                new FillFlowContainer
                                 {
-                                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(4, 0)),
+                                    Direction = FlowDirection.Right,
+                                    Spacing = new Vector2(4, 0),
                                     AutoSizeAxes = Axes.Both,
                                     Children = new[]
                                     {

osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Beatmaps.Drawables
         private OsuConfigManager config;
         private Bindable<bool> preferUnicode;
         private WorkingBeatmap beatmap;
-        private FlowContainer difficultyIcons;
+        private FillFlowContainer difficultyIcons;
 
         public BeatmapSetHeader(WorkingBeatmap beatmap)
         {
@@ -36,9 +36,9 @@ namespace osu.Game.Beatmaps.Drawables
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
-                new FlowContainer
+                new FillFlowContainer
                 {
-                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                    Direction = FlowDirection.Down,
                     Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 },
                     AutoSizeAxes = Axes.Both,
                     Children = new[]
@@ -58,7 +58,7 @@ namespace osu.Game.Beatmaps.Drawables
                             TextSize = 17,
                             Shadow = true,
                         },
-                        difficultyIcons = new FlowContainer
+                        difficultyIcons = new FillFlowContainer
                         {
                             Margin = new MarginPadding { Top = 5 },
                             AutoSizeAxes = Axes.Both,
@@ -109,10 +109,10 @@ namespace osu.Game.Beatmaps.Drawables
 
                 Children = new[]
                 {
-                    new FlowContainer
+                    new FillFlowContainer
                     {
                         Depth = -1,
-                        FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
+                        Direction = FlowDirection.Right,
                         RelativeSizeAxes = Axes.Both,
                         // This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle
                         Shear = new Vector2(0.8f, 0),

osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs

@@ -19,9 +19,9 @@ namespace osu.Game.Graphics.UserInterface
 
             Children = new[]
             {
-                new FlowContainer
+                new FillFlowContainer
                 {
-                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
+                    Direction = FlowDirection.Right,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Children = new Drawable[]

osu.Game/Graphics/UserInterface/StarCounter.cs

@@ -68,10 +68,11 @@ namespace osu.Game.Graphics.UserInterface
 
             Children = new Drawable[]
             {
-                stars = new FlowContainer<Star>
+                stars = new FillFlowContainer<Star>
                 {
                     AutoSizeAxes = Axes.Both,
-                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(star_spacing)),
+                    Direction = FlowDirection.Right,
+                    Spacing = new Vector2(star_spacing),
                 }
             };
 

osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs

@@ -33,13 +33,13 @@ namespace osu.Game.Graphics.UserInterface.Volume
 
             Children = new Drawable[]
             {
-                new FlowContainer
+                new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
                     Margin = new MarginPadding { Left = 10, Right = 10, Top = 30, Bottom = 30 },
-                    FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(15, 0)),
+                    Spacing = new Vector2(15, 0),
                     Children = new Drawable[]
                     {
                         volumeMeterMaster = new VolumeMeter("Master"),

osu.Game/Online/Chat/Drawables/DrawableChannel.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Online.Chat.Drawables
     public class DrawableChannel : Container
     {
         private readonly Channel channel;
-        private FlowContainer flow;
+        private FillFlowContainer flow;
         private ScrollContainer scroll;
 
         public DrawableChannel(Channel channel)
@@ -39,9 +39,9 @@ namespace osu.Game.Online.Chat.Drawables
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
-                        flow = new FlowContainer
+                        flow = new FillFlowContainer
                         {
-                            FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                            Direction = FlowDirection.Down,
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Padding = new MarginPadding { Left = 20, Right = 20 }

osu.Game/Overlays/NotificationManager.cs

@@ -44,9 +44,9 @@ namespace osu.Game.Overlays
                     Margin = new MarginPadding { Top = Toolbar.Toolbar.HEIGHT },
                     Children = new[]
                     {
-                        sections = new FlowContainer<NotificationSection>
+                        sections = new FillFlowContainer<NotificationSection>
                         {
-                            FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                            Direction = FlowDirection.Down,
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
                             Children = new []

osu.Game/Overlays/Notifications/NotificationSection.cs

@@ -16,7 +16,7 @@ using OpenTK;
 
 namespace osu.Game.Overlays.Notifications
 {
-    public class NotificationSection : FlowContainer
+    public class NotificationSection : FillFlowContainer
     {
         private OsuSpriteText titleText;
         private OsuSpriteText countText;
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Notifications
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-            FlowStrategy = FlowStrategies.CreateVerticalFlow();
+            Direction = FlowDirection.Down;
 
             Padding = new MarginPadding
             {
@@ -85,13 +85,13 @@ namespace osu.Game.Overlays.Notifications
                             Origin = Anchor.TopRight,
                             Action = clearAll
                         },
-                        new FlowContainer
+                        new FillFlowContainer
                         {
                             Margin = new MarginPadding
                             {
                                 Bottom = 5
                             },
-                            FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(5, 0)),
+                            Spacing = new Vector2(5, 0),
                             AutoSizeAxes = Axes.Both,
                             Children = new Drawable[]
                             {
@@ -110,13 +110,13 @@ namespace osu.Game.Overlays.Notifications
                         },
                     },
                 },
-                notifications = new FlowContainer<Notification>
+                notifications = new FillFlowContainer<Notification>
                 {
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
                     LayoutDuration = 150,
                     LayoutEasing = EasingTypes.OutQuart,
-                    FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(3)),
+                    Spacing = new Vector2(3),
                 }
             });
         }

osu.Game/Overlays/Options/OptionDropDown.cs

@@ -14,7 +14,7 @@ using System.Collections.Generic;
 
 namespace osu.Game.Overlays.Options
 {
-    public class OptionDropDown<T> : FlowContainer
+    public class OptionDropDown<T> : FillFlowContainer
     {
         private DropDownMenu<T> dropdown;
         private SpriteText text;
@@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Options
         {
             Items = new KeyValuePair<string, T>[0];
 
-            FlowStrategy = FlowStrategies.CreateVerticalFlow();
+            Direction = FlowDirection.Down;
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Children = new Drawable[]

osu.Game/Overlays/Options/OptionSlider.cs

@@ -12,7 +12,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Options
 {
-    public class OptionSlider<T> : FlowContainer where T : struct
+    public class OptionSlider<T> : FillFlowContainer where T : struct
     {
         private SliderBar<T> slider;
         private SpriteText text;
@@ -40,7 +40,6 @@ namespace osu.Game.Overlays.Options
 
         public OptionSlider()
         {
-            FlowStrategy = FlowStrategies.CreateFillFlow();
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Padding = new MarginPadding { Right = 5 };

osu.Game/Overlays/Options/OptionsSection.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Options
 {
     public abstract class OptionsSection : Container
     {
-        protected FlowContainer FlowContent;
+        protected FillFlowContainer FlowContent;
         protected override Container<Drawable> Content => FlowContent;
 
         public abstract FontAwesome Icon { get; }
@@ -58,10 +58,11 @@ namespace osu.Game.Overlays.Options
                             TextSize = header_size,
                             Text = Header,
                         },
-                        FlowContent = new FlowContainer
+                        FlowContent = new FillFlowContainer
                         {
                             Margin = new MarginPadding { Top = header_size + header_margin },
-                            FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 30)),
+                            Direction = FlowDirection.Down,
+                            Spacing = new Vector2(0, 30),
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
                         },

osu.Game/Overlays/Options/OptionsSubsection.cs

@@ -9,7 +9,7 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Options
 {
-    public abstract class OptionsSubsection : FlowContainer
+    public abstract class OptionsSubsection : FillFlowContainer
     {
         private Container<Drawable> content;
         protected override Container<Drawable> Content => content;
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Options
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-            FlowStrategy = FlowStrategies.CreateVerticalFlow();
+            Direction = FlowDirection.Down;
             AddInternal(new Drawable[]
             {
                 new OsuSpriteText
@@ -29,9 +29,10 @@ namespace osu.Game.Overlays.Options
                     Margin = new MarginPadding { Bottom = 10 },
                     Font = @"Exo2.0-Black",
                 },
-                content = new FlowContainer
+                content = new FillFlowContainer
                 {
-                    FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 5)),
+                    Direction = FlowDirection.Down,
+                    Spacing = new Vector2(0, 5),
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                 },

osu.Game/Overlays/Options/Sections/EditorSection.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Options.Sections
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            FlowContent.FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(0, 5));
+            FlowContent.Spacing = new Vector2(0, 5);
             Children = new Drawable[]
             {
                 new OsuCheckbox

osu.Game/Overlays/Options/Sections/General/LoginOptions.cs

@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Options.Sections.General
             }
         }
 
-        class LoginForm : FlowContainer
+        class LoginForm : FillFlowContainer
         {
             private TextBox username;
             private TextBox password;
@@ -100,7 +100,8 @@ namespace osu.Game.Overlays.Options.Sections.General
             private void load(APIAccess api, OsuConfigManager config)
             {
                 this.api = api;
-                FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 5));
+                Direction = FlowDirection.Down;
+                Spacing = new Vector2(0, 5);
                 AutoSizeAxes = Axes.Y;
                 RelativeSizeAxes = Axes.X;
                 Children = new Drawable[]

osu.Game/Overlays/Options/Sections/MaintenanceSection.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Options.Sections
 
         public MaintenanceSection()
         {
-            FlowContent.FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(0, 5));
+            FlowContent.Spacing = new Vector2(0, 5);
             Children = new Drawable[]
             {
                 new OsuButton

osu.Game/Overlays/Options/Sections/SkinSection.cs

@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Options.Sections
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            FlowContent.FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(0, 5));
+            FlowContent.Spacing = new Vector2(0, 5);
             Children = new Drawable[]
             {
                 new OptionLabel { Text = "TODO: Skin preview textures" },

osu.Game/Overlays/Options/Sidebar.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Options
 {
     public class Sidebar : Container
     {
-        private FlowContainer content;
+        private FillFlowContainer content;
         internal const float DEFAULT_WIDTH = ToolbarButton.WIDTH;
         internal const int EXPANDED_WIDTH = 200;
         protected override Container<Drawable> Content => content;
@@ -34,13 +34,13 @@ namespace osu.Game.Overlays.Options
                 {
                     Children = new []
                     {
-                        content = new FlowContainer
+                        content = new FillFlowContainer
                         {
                             Origin = Anchor.CentreLeft,
                             Anchor = Anchor.CentreLeft,
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
-                            FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                            Direction = FlowDirection.Down,
                         }
                     }
                 },

osu.Game/Overlays/OptionsOverlay.cs

@@ -73,11 +73,11 @@ namespace osu.Game.Overlays
                     Margin = new MarginPadding { Left = SIDEBAR_WIDTH },
                     Children = new[]
                     {
-                        new FlowContainer
+                        new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
-                            FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                            Direction = FlowDirection.Down,
 
                             Children = new Drawable[]
                             {
@@ -94,11 +94,11 @@ namespace osu.Game.Overlays
                                     TextSize = 18,
                                     Margin = new MarginPadding { Left = CONTENT_MARGINS, Bottom = 30 },
                                 },
-                                new FlowContainer
+                                new FillFlowContainer
                                 {
                                     AutoSizeAxes = Axes.Y,
                                     RelativeSizeAxes = Axes.X,
-                                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                                    Direction = FlowDirection.Down,
                                     Children = sections,
                                 }
                             }

osu.Game/Overlays/Pause/PauseOverlay.cs

@@ -66,7 +66,7 @@ namespace osu.Game.Overlays.Pause
             }
         }
 
-        private FlowContainer retryCounterContainer;
+        private FillFlowContainer retryCounterContainer;
 
         public override bool Contains(Vector2 screenSpacePos) => true;
         public override bool HandleInput => State == Visibility.Visible;
@@ -100,19 +100,21 @@ namespace osu.Game.Overlays.Pause
                     Colour = Color4.Black,
                     Alpha = background_alpha,
                 },
-                new FlowContainer
+                new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 50)),
+                    Direction = FlowDirection.Down,
+                    Spacing = new Vector2(0, 50),
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
                     Children = new Drawable[]
                     {
-                        new FlowContainer
+                        new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
-                            FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 20)),
+                            Direction = FlowDirection.Down,
+                            Spacing = new Vector2(0, 20),
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
                             Children = new Drawable[]
@@ -139,7 +141,7 @@ namespace osu.Game.Overlays.Pause
                                 }
                             }
                         },
-                        new FlowContainer
+                        new FillFlowContainer
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
@@ -186,7 +188,7 @@ namespace osu.Game.Overlays.Pause
                                 }
                             }
                         },
-                        retryCounterContainer = new FlowContainer
+                        retryCounterContainer = new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
                             Origin = Anchor.TopCentre,

osu.Game/Overlays/Toolbar/Toolbar.cs

@@ -41,9 +41,9 @@ namespace osu.Game.Overlays.Toolbar
             Children = new Drawable[]
             {
                 new ToolbarBackground(),
-                new FlowContainer
+                new FillFlowContainer
                 {
-                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
+                    Direction = FlowDirection.Right,
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
@@ -63,7 +63,7 @@ namespace osu.Game.Overlays.Toolbar
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
+                    Direction = FlowDirection.Right,
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
@@ -141,7 +141,7 @@ namespace osu.Game.Overlays.Toolbar
             FadeOut(transition_time);
         }
 
-        class PassThroughFlowContainer : FlowContainer
+        class PassThroughFlowContainer : FillFlowContainer
         {
             //needed to get input to the login overlay.
             public override bool Contains(Vector2 screenSpacePos) => true;

osu.Game/Overlays/Toolbar/ToolbarButton.cs

@@ -62,10 +62,10 @@ namespace osu.Game.Overlays.Toolbar
         protected TextAwesome DrawableIcon;
         protected SpriteText DrawableText;
         protected Box HoverBackground;
-        private FlowContainer tooltipContainer;
+        private FillFlowContainer tooltipContainer;
         private SpriteText tooltip1;
         private SpriteText tooltip2;
-        protected FlowContainer Flow;
+        protected FillFlowContainer Flow;
         private SampleChannel sampleClick;
 
         public ToolbarButton()
@@ -82,9 +82,10 @@ namespace osu.Game.Overlays.Toolbar
                     BlendingMode = BlendingMode.Additive,
                     Alpha = 0,
                 },
-                Flow = new FlowContainer
+                Flow = new FillFlowContainer
                 {
-                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(5)),
+                    Direction = FlowDirection.Right,
+                    Spacing = new Vector2(5),
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     Padding = new MarginPadding { Left = Toolbar.HEIGHT / 2, Right = Toolbar.HEIGHT / 2 },
@@ -104,9 +105,9 @@ namespace osu.Game.Overlays.Toolbar
                         },
                     },
                 },
-                tooltipContainer = new FlowContainer
+                tooltipContainer = new FillFlowContainer
                 {
-                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                    Direction = FlowDirection.Down,
                     RelativeSizeAxes = Axes.Both, //stops us being considered in parent's autosize
                     Anchor = (TooltipAnchor & Anchor.x0) > 0 ? Anchor.BottomLeft : Anchor.BottomRight,
                     Origin = TooltipAnchor,

osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Toolbar
     {
         const float padding = 10;
 
-        private FlowContainer modeButtons;
+        private FillFlowContainer modeButtons;
         private Drawable modeButtonLine;
         private ToolbarModeButton activeButton;
 
@@ -32,11 +32,11 @@ namespace osu.Game.Overlays.Toolbar
             Children = new Drawable[]
             {
                 new OpaqueBackground(),
-                modeButtons = new FlowContainer
+                modeButtons = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
-                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
+                    Direction = FlowDirection.Right,
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     Padding = new MarginPadding { Left = padding, Right = padding },

osu.Game/Screens/GameScreenWhiteBox.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Screens
 
         protected virtual IEnumerable<Type> PossibleChildren => null;
 
-        private FlowContainer childModeButtons;
+        private FillFlowContainer childModeButtons;
         private Container textContainer;
         private Box box;
 
@@ -124,9 +124,9 @@ namespace osu.Game.Screens
                         Exit();
                     }
                 },
-                childModeButtons = new FlowContainer
+                childModeButtons = new FillFlowContainer
                 {
-                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                    Direction = FlowDirection.Down,
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Both,

osu.Game/Screens/Menu/ButtonSystem.cs

@@ -78,7 +78,8 @@ namespace osu.Game.Screens.Menu
                         },
                         buttonFlow = new FlowContainerWithOrigin
                         {
-                            FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(-WEDGE_WIDTH, 0)),
+                            Direction = FlowDirection.Right,
+                            Spacing = new Vector2(-WEDGE_WIDTH, 0),
                             Anchor = Anchor.Centre,
                             AutoSizeAxes = Axes.Both,
                             Children = new[]

osu.Game/Screens/Menu/Disclaimer.cs

@@ -27,12 +27,13 @@ namespace osu.Game.Screens.Menu
 
             Children = new Drawable[]
             {
-                new FlowContainer
+                new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    FlowStrategy = FlowStrategies.CreateVerticalFlow(new Vector2(0, 2)),
+                    Direction = FlowDirection.Down,
+                    Spacing = new Vector2(0, 2),
                     Children = new Drawable[]
                     {
                         icon = new TextAwesome

osu.Game/Screens/Menu/FlowContainerWithOrigin.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Menu
     /// <summary>
     /// A flow container with an origin based on one of its contained drawables.
     /// </summary>
-    public class FlowContainerWithOrigin : FlowContainer
+    public class FlowContainerWithOrigin : FillFlowContainer
     {
         /// <summary>
         /// A target drawable which this flowcontainer should be centered around.
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Menu
 
         protected override IComparer<Drawable> DepthComparer => new ReverseCreationOrderDepthComparer();
 
-        protected override IEnumerable<Drawable> SortedChildren => base.SortedChildren.Reverse();
+        protected override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse();
 
         public override Anchor Origin => Anchor.Custom;
 

osu.Game/Screens/Play/KeyCounterCollection.cs

@@ -8,11 +8,11 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Screens.Play
 {
-    public class KeyCounterCollection : FlowContainer<KeyCounter>
+    public class KeyCounterCollection : FillFlowContainer<KeyCounter>
     {
         public KeyCounterCollection()
         {
-            FlowStrategy = FlowStrategies.CreateHorizontalFlow();
+            Direction = FlowDirection.Right;
             AutoSizeAxes = Axes.Both;
         }
 

osu.Game/Screens/Play/PlayerLoader.cs

@@ -131,12 +131,12 @@ namespace osu.Game.Screens.Play
                 AutoSizeAxes = Axes.Both;
                 Children = new Drawable[]
                 {
-                    new FlowContainer()
+                    new FillFlowContainer()
                     {
                         AutoSizeAxes = Axes.Both,
                         Origin = Anchor.TopCentre,
                         Anchor = Anchor.TopCentre,
-                        FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                        Direction = FlowDirection.Down,
                         Children = new Drawable[]
                         {
                             new OsuSpriteText

osu.Game/Screens/Ranking/Results.cs

@@ -65,10 +65,10 @@ namespace osu.Game.Screens.Ranking
 
             Children = new Drawable[]
             {
-                new FlowContainer
+                new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                    Direction = FlowDirection.Down,
                     Children = new Drawable[]
                     {
                         new OsuSpriteText

osu.Game/Screens/Select/BeatmapInfoWedge.cs

@@ -121,11 +121,11 @@ namespace osu.Game.Screens.Select
                         },
                     },
                     // Text for beatmap info
-                    new FlowContainer
+                    new FillFlowContainer
                     {
                         Anchor = Anchor.BottomLeft,
                         Origin = Anchor.BottomLeft,
-                        FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                        Direction = FlowDirection.Down,
                         Margin = new MarginPadding { Top = 10, Left = 25, Right = 10, Bottom = 20 },
                         AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
@@ -144,10 +144,10 @@ namespace osu.Game.Screens.Select
                                 TextSize = 17,
                                 Shadow = true,
                             },
-                            new FlowContainer
+                            new FillFlowContainer
                             {
                                 Margin = new MarginPadding { Top = 10 },
-                                FlowStrategy = FlowStrategies.CreateHorizontalFlow(),
+                                Direction = FlowDirection.Right,
                                 AutoSizeAxes = Axes.Both,
                                 Children = new []
                                 {
@@ -167,10 +167,10 @@ namespace osu.Game.Screens.Select
                                     },
                                 }
                             },
-                            new FlowContainer
+                            new FillFlowContainer
                             {
                                 Margin = new MarginPadding { Top = 20 },
-                                FlowStrategy = FlowStrategies.CreateFillFlow(new Vector2(40, 0)),
+                                Spacing = new Vector2(40, 0),
                                 AutoSizeAxes = Axes.Both,
                                 Children = labels
                             },

osu.Game/Screens/Select/FilterControl.cs

@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Select
                     Alpha = 0.8f,
                     RelativeSizeAxes = Axes.Both,
                 },
-                new FlowContainer
+                new FillFlowContainer
                 {
                     Padding = new MarginPadding(20),
                     AutoSizeAxes = Axes.Y,
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Select
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     Width = 0.4f, // TODO: InnerWidth property or something
-                    FlowStrategy = FlowStrategies.CreateVerticalFlow(),
+                    Direction = FlowDirection.Down,
                     Children = new Drawable[]
                     {
                         searchTextBox = new SearchTextBox {
@@ -174,10 +174,11 @@ namespace osu.Game.Screens.Select
                         Origin = Anchor.BottomLeft,
                         Anchor = Anchor.BottomLeft,
                     },
-                    new FlowContainer
+                    new FillFlowContainer
                     {
                         AutoSizeAxes = Axes.Both,
-                        FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(10, 0)),
+                        Direction = FlowDirection.Right,
+                        Spacing = new Vector2(10, 0),
                         Children = new Drawable[]
                         {
                             new TabItem
@@ -205,10 +206,11 @@ namespace osu.Game.Screens.Select
                             }
                         }
                     },
-                    new FlowContainer
+                    new FillFlowContainer
                     {
                         AutoSizeAxes = Axes.Both,
-                        FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(10, 0)),
+                        Direction = FlowDirection.Right,
+                        Spacing = new Vector2(10, 0),
                         Origin = Anchor.TopRight,
                         Anchor = Anchor.TopRight,
                         Children = new Drawable[]

osu.Game/Screens/Select/Footer.cs

@@ -30,7 +30,7 @@ namespace osu.Game.Screens.Select
         public Action OnBack;
         public Action OnStart;
 
-        private FlowContainer buttons;
+        private FillFlowContainer buttons;
 
         public OsuLogo StartButton;
 
@@ -91,20 +91,21 @@ namespace osu.Game.Screens.Select
                     Origin = Anchor.BottomLeft,
                     Action = () => OnBack?.Invoke(),
                 },
-                new FlowContainer
+                new FillFlowContainer
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     Position = new Vector2(BackButton.SIZE_EXTENDED.X + padding, 0),
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
-                    FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(padding, 0)),
+                    Direction = FlowDirection.Right,
+                    Spacing = new Vector2(padding, 0),
                     Children = new Drawable[]
                     {
-
+                        buttons = new FillFlowContainer
-                        buttons = new FlowContainer
                         {
-                            FlowStrategy = FlowStrategies.CreateHorizontalFlow(new Vector2(0.2f, 0)),
+                            Direction = FlowDirection.Right,
+                            Spacing = new Vector2(0.2f, 0),
                             AutoSizeAxes = Axes.Both,
                         }
                     }