Merge branch 'v2_develop' into v2_3767_restoring-drivers-and-fixes

Author: tig

CommunityToolkitExample/LoginView.cs

@@ -59,6 +59,7 @@ public void Receive (Message<LoginActions> message)
                 }
         }
         SetText();
+        // BUGBUG: This should not be needed:
         Application.LayoutAndDraw ();
     }
 

Terminal.Gui/Application/Application.Keyboard.cs

@@ -205,7 +205,7 @@ internal static void AddApplicationKeyBindings ()
                     Command.Refresh,
                     static () =>
                     {
-                        LayoutAndDraw ();
+                        LayoutAndDraw (true);
 
                         return true;
                     }

Terminal.Gui/Application/Application.Run.cs

@@ -505,6 +505,11 @@ public static void LayoutAndDraw (bool forceDraw = false)
     {
         bool neededLayout = View.Layout (TopLevels.Reverse (), Screen.Size);
 
+        if (ClearScreenNextIteration)
+        {
+            forceDraw = true;
+            ClearScreenNextIteration = false;
+        }
         if (forceDraw)
         {
             Driver?.ClearContents ();
@@ -688,6 +693,6 @@ public static void End (RunState runState)
         runState.Toplevel = null;
         runState.Dispose ();
 
-        LayoutAndDraw ();
+        LayoutAndDraw (true);
     }
 }

Terminal.Gui/Application/Application.Screen.cs

@@ -63,8 +63,17 @@ public static bool OnSizeChanging (SizeChangedEventArgs args)
             t.SetNeedsLayout ();
         }
 
-        LayoutAndDraw ();
+        LayoutAndDraw (true);
 
         return true;
     }
+
+    /// <summary>
+    ///     Gets or sets whether the screen will be cleared, and all Views redrawn, during the next Application iteration.
+    /// </summary>
+    /// <remarks>
+    ///     This is typicall set to true when a View's <see cref="View.Frame"/> changes and that view has no
+    ///     SuperView (e.g. when <see cref="Application.Top"/> is moved or resized.
+    /// </remarks>
+    public static bool ClearScreenNextIteration { get; set; }
 }

Terminal.Gui/Application/Application.cs

@@ -215,6 +215,8 @@ internal static void ResetState (bool ignoreDisposed = false)
 
         Navigation = null;
 
+        ClearScreenNextIteration = false;
+
         AddApplicationKeyBindings ();
 
         // Reset synchronization context to allow the user to run async/await,

Terminal.Gui/View/View.Layout.cs

@@ -557,7 +557,14 @@ public bool SetRelativeLayout (Size superviewContentSize)
                 SetTitleTextFormatterSize ();
             }
 
-            SuperView?.SetNeedsDraw ();
+            if (SuperView is { })
+            {
+                SuperView?.SetNeedsDraw ();
+            }
+            else
+            {
+                Application.ClearScreenNextIteration = true;
+            }
         }
 
         if (TextFormatter.ConstrainToWidth is null)

Terminal.Gui/View/View.cs

@@ -369,7 +369,14 @@ public virtual bool Visible
             SetNeedsLayout ();
             SuperView?.SetNeedsLayout ();
             SetNeedsDraw ();
-            SuperView?.SetNeedsDraw ();
+            if (SuperView is { })
+            {
+                SuperView?.SetNeedsDraw ();
+            }
+            else
+            {
+                Application.ClearScreenNextIteration = true;
+            }
         }
     }
 

Terminal.Gui/Views/Menu/Menu.cs

@@ -608,8 +608,7 @@ public void Run (Action? action)
 
         Application.UngrabMouse ();
         _host.CloseAllMenus ();
-        Application.Driver!.ClearContents ();
-        Application.LayoutAndDraw ();
+        Application.LayoutAndDraw (true);
 
         _host.Run (action);
     }

Terminal.Gui/Views/Menu/MenuBar.cs

@@ -1117,7 +1117,7 @@ internal bool SelectItem (MenuItem? item)
 
         Application.UngrabMouse ();
         CloseAllMenus ();
-        Application.LayoutAndDraw ();
+        Application.LayoutAndDraw (true);
         _openedByAltKey = true;
 
         return Run (item.Action);

UnitTests/Application/ApplicationScreenTests.cs

@@ -0,0 +1,68 @@
+using Xunit.Abstractions;
+
+namespace Terminal.Gui.ApplicationTests;
+
+public class ApplicationScreenTests (ITestOutputHelper output)
+{
+    [Fact]
+    public void ClearScreenNextIteration_Resets_To_False_After_LayoutAndDraw ()
+    {
+        // Arrange
+        Application.Init ();
+
+        // Act
+        Application.ClearScreenNextIteration = true;
+        Application.LayoutAndDraw ();
+
+        // Assert
+        Assert.False (Application.ClearScreenNextIteration);
+
+        // Cleanup
+        Application.ResetState (true);
+    }
+
+    [Fact]
+    public void ClearContents_Called_When_Top_Frame_Changes ()
+    {
+        // Arrange
+        Application.Init (new FakeDriver ());
+        Application.Top = new Toplevel ();
+        Application.TopLevels.Push (Application.Top);
+
+        int clearedContentsRaised = 0;
+
+        Application.Driver!.ClearedContents += (e, a) => clearedContentsRaised++;
+
+        // Act
+        Application.LayoutAndDraw ();
+
+        // Assert
+        Assert.Equal (1, clearedContentsRaised);
+
+        // Act
+        Application.Top.SetNeedsLayout ();
+        Application.LayoutAndDraw ();
+
+        // Assert
+        Assert.Equal (1, clearedContentsRaised);
+
+        // Act
+        Application.Top.X = 1;
+        Application.LayoutAndDraw ();
+
+        // Assert
+        Assert.Equal (2, clearedContentsRaised);
+
+        // Act
+        Application.Top.Width = 10;
+        Application.LayoutAndDraw ();
+
+        // Assert
+        Assert.Equal (3, clearedContentsRaised);
+
+        // Cleanup
+        Application.Top.Dispose ();
+        Application.Top = null;
+        Application.Shutdown ();
+    }
+}