MVP for Multi-Line Textbox

osu.Framework.Tests/Visual/UserInterface/TestSceneTextArea.cs

@@ -0,0 +1,35 @@
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
+
+namespace osu.Framework.Tests.Visual.UserInterface
+{
+    public partial class TestSceneTextArea : ManualInputManagerTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Add(new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding(30),
+                Child = new TextArea
+                {
+                    RelativeSizeAxes = Axes.None,
+                    Width = 300,
+                    Height = 200,
+                    Text =
+                        "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. "
+                        + "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. "
+                        + "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. "
+                        + "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum"
+                }
+            });
+        }
+    }
+}

osu.Framework/Graphics/Containers/FillFlowContainer.cs

@@ -183,7 +183,7 @@ static Axes toAxes(FillDirection direction)
                     float rowWidth = rowBeginOffset + current.X + (1 - spacingFactor(c).X) * size.X;
 
                     //We've exceeded our allowed width, move to a new row
-                    if (direction != FillDirection.Horizontal && (Precision.DefinitelyBigger(rowWidth, max.X) || direction == FillDirection.Vertical))
+                    if (direction != FillDirection.Horizontal && (Precision.DefinitelyBigger(rowWidth, max.X) || direction == FillDirection.Vertical || ForceNewRow(c)))
                     {
                         current.X = 0;
                         current.Y += rowHeight;
@@ -286,13 +286,21 @@ static Axes toAxes(FillDirection direction)
 
                     yield return layoutPosition;
                 }
+
+                OnLayoutComputed(children, layoutPositions, rowIndices);
             }
             finally
             {
                 ArrayPool<Vector2>.Shared.Return(layoutPositions);
                 ArrayPool<int>.Shared.Return(rowIndices);
             }
         }
+
+        protected virtual void OnLayoutComputed(Drawable[] children, Vector2[] layoutPositions, int[] rowIndices)
+        {
+        }
+
+        protected virtual bool ForceNewRow(Drawable drawable) => false;
     }
 
     /// <summary>

osu.Framework/Graphics/Sprites/SpriteText.cs

@@ -444,7 +444,7 @@ public MarginPadding Padding
         /// <summary>
         /// The characters in local space.
         /// </summary>
-        private List<TextBuilderGlyph> characters
+        internal List<TextBuilderGlyph> Characters
         {
             get
             {

osu.Framework/Graphics/Sprites/SpriteText_DrawNode.cs

@@ -86,7 +86,7 @@ protected override void Draw(IRenderer renderer)
             /// </summary>
             private void updateScreenSpaceCharacters()
             {
-                int partCount = Source.characters.Count;
+                int partCount = Source.Characters.Count;
 
                 if (parts == null)
                     parts = new List<ScreenSpaceCharacterPart>(partCount);
@@ -98,7 +98,7 @@ private void updateScreenSpaceCharacters()
 
                 Vector2 inflationAmount = DrawInfo.MatrixInverse.ExtractScale().Xy;
 
-                foreach (var character in Source.characters)
+                foreach (var character in Source.Characters)
                 {
                     parts.Add(new ScreenSpaceCharacterPart
                     {