Merge pull request #6556 from bdach/we-back-in-the-text-flow-mine

Fix text flow container layout changing after one frame in some cases

Author: smoogipoo

osu.Framework.Tests/Visual/Containers/TestSceneTextFlowContainer.cs

@@ -10,6 +10,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
+using osu.Framework.Threading;
 using osuTK;
 using osuTK.Graphics;
 
@@ -142,6 +143,26 @@ public void TestSizing()
                 topLevelContainer.RelativeSizeAxes = textContainer.RelativeSizeAxes = Axes.None;
                 topLevelContainer.AutoSizeAxes = textContainer.AutoSizeAxes = Axes.Both;
             });
+            AddStep("set autosize width with right anchored text", () =>
+            {
+                topLevelContainer.RelativeSizeAxes = textContainer.RelativeSizeAxes = Axes.None;
+                topLevelContainer.AutoSizeAxes = textContainer.AutoSizeAxes = Axes.Both;
+                textContainer.TextAnchor = Anchor.TopRight;
+            });
+        }
+
+        [Test]
+        public void TestSetTextRepeatedly()
+        {
+            ScheduledDelegate repeat = null!;
+            AddStep("set text repeatedly", () => repeat = Scheduler.AddDelayed(() =>
+            {
+                textContainer.Clear();
+                textContainer.AddParagraph("first paragraph lorem ipsum dolor sit amet and whatever else is needed to break a line");
+                textContainer.AddParagraph(string.Empty);
+                textContainer.AddParagraph("second paragraph lorem ipsum dolor sit amet and whatever else is needed to break a line");
+            }, 50, true));
+            AddStep("cancel", () => repeat.Cancel());
         }
 
         private void assertSpriteTextCount(int count)

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 || ForceNewRow(c)))
+                    if (direction != FillDirection.Horizontal && (Precision.DefinitelyBigger(rowWidth, max.X) || direction == FillDirection.Vertical))
                     {
                         current.X = 0;
                         current.Y += rowHeight;
@@ -293,13 +293,6 @@ static Axes toAxes(FillDirection direction)
                 ArrayPool<int>.Shared.Return(rowIndices);
             }
         }
-
-        /// <summary>
-        /// Returns true if the given child should be placed on a new row, false otherwise. This will be called automatically for each child in this FillFlowContainers FlowingChildren-List.
-        /// </summary>
-        /// <param name="child">The child to check.</param>
-        /// <returns>True if the given child should be placed on a new row, false otherwise.</returns>
-        protected virtual bool ForceNewRow(Drawable child) => false;
     }
 
     /// <summary>

osu.Framework/Graphics/Containers/FlowContainer.cs

@@ -69,16 +69,10 @@ public Vector2 MaximumSize
 
         protected override bool RequiresChildrenUpdate => base.RequiresChildrenUpdate || !layout.IsValid;
 
-        internal event Action OnLayoutInvalidated;
-
         /// <summary>
         /// Invoked when layout should be invalidated.
         /// </summary>
-        protected virtual void InvalidateLayout()
-        {
-            layout.Invalidate();
-            OnLayoutInvalidated?.Invoke();
-        }
+        protected internal void InvalidateLayout() => layout.Invalidate();
 
         private readonly Dictionary<Drawable, float> layoutChildren = new Dictionary<Drawable, float>();