Merge pull request #5445 from gui-cs/copilot/remove-dialog-setstyle

Fixes #5444 - Remove Dialog.SetStyle; set scheme and arrangement in constructor

Author: tig

Terminal.Gui/Views/Dialog.cs

@@ -13,7 +13,7 @@ namespace Terminal.Gui.Views;
 ///     </para>
 ///     <para>
 ///         By default, <see cref="Dialog"/> is centered with <see cref="Dim.Auto"/> sizing and uses the
-///         <see cref="Schemes.Dialog"/> color scheme when running.
+///         <see cref="Schemes.Dialog"/> color scheme (applied at construction time, regardless of running state).
 ///     </para>
 ///     <para>
 ///         To run modally, pass the dialog to <see cref="IApplication.Run(IRunnable, Func{Exception, bool})"/>.

Terminal.Gui/Views/DialogTResult.cs

@@ -12,7 +12,7 @@ namespace Terminal.Gui.Views;
 /// <remarks>
 ///     <para>
 ///         By default, <see cref="Dialog{TResult}"/> is centered with <see cref="Dim.Auto"/> sizing and uses the
-///         <see cref="Schemes.Dialog"/> color scheme when running.
+///         <see cref="Schemes.Dialog"/> color scheme (applied at construction time, regardless of running state).
 ///     </para>
 ///     <para>
 ///         To run modally, pass the dialog to <see cref="IApplication.Run(IRunnable, Func{Exception, bool})"/>.
@@ -99,6 +99,8 @@ public Dialog ()
 
         SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Dialog);
 
+        Arrangement |= ViewArrangement.Movable | ViewArrangement.Resizable | ViewArrangement.Overlapped;
+
         CommandsToBubbleUp = [Command.Accept];
 
         _buttonContainer = new View
@@ -117,7 +119,6 @@ public Dialog ()
         Padding.GetOrCreateView ();
         Padding.View?.Add (_buttonContainer);
         UpdateSizes ();
-        SetStyle ();
     }
 
     /// <inheritdoc/>
@@ -334,40 +335,6 @@ public Button [] Buttons
         }
     }
 
-    /// <inheritdoc/>
-    protected override void OnIsRunningChanged (bool newIsModal)
-    {
-        base.OnIsRunningChanged (newIsModal);
-
-        if (newIsModal)
-        {
-            SetStyle ();
-        }
-    }
-
-    private void SetStyle ()
-    {
-        if (IsRunning)
-        {
-            // When running, restore to Dialog scheme only if it was set to Base by SetStyle
-            // (i.e., the scheme was not explicitly overridden before running, e.g. by
-            // MessageBox.ErrorQuery which sets SchemeName = "Error" before calling app.Run).
-            if (SchemeName == SchemeManager.SchemesToSchemeName (Schemes.Base))
-            {
-                SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Dialog);
-            }
-
-            Arrangement |= ViewArrangement.Movable | ViewArrangement.Resizable | ViewArrangement.Overlapped;
-        }
-        else
-        {
-            SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Base);
-
-            // strip out movable and resizable
-            Arrangement &= ~(ViewArrangement.Movable | ViewArrangement.Resizable);
-        }
-    }
-
     // Dialogs are Modal and Focus is indicated by their Border. _drawingText ensures the
     // Text of the dialog (e.g. for a MessageBox) is always drawn using the Normal Attribute
     // instead of the Focus attribute.

Tests/UnitTestsParallelizable/Views/DialogTests.Generic.cs

@@ -700,7 +700,7 @@ public void GenericInherits_Properties ()
         Assert.Equal (AlignmentModes.StartToEnd | AlignmentModes.AddSpaceBetweenItems, dialog.ButtonAlignmentModes);
         Assert.Equal (LineStyle.Heavy, dialog.BorderStyle);
         Assert.Equal (ShadowStyles.Transparent, dialog.ShadowStyle);
-        Assert.Equal (ViewArrangement.Overlapped, dialog.Arrangement);
+        Assert.Equal (ViewArrangement.Movable | ViewArrangement.Resizable | ViewArrangement.Overlapped, dialog.Arrangement);
 
         dialog.Dispose ();
     }

Tests/UnitTestsParallelizable/Views/DialogTests.cs

@@ -163,7 +163,7 @@ public void Constructor_Initializes_DefaultValues ()
         Assert.Empty (dialog.Buttons);
         Assert.Null (dialog.Result);
         Assert.True (dialog.Canceled); // Canceled is true when Result is null
-        Assert.Equal (ViewArrangement.Overlapped, dialog.Arrangement);
+        Assert.Equal (ViewArrangement.Movable | ViewArrangement.Resizable | ViewArrangement.Overlapped, dialog.Arrangement);
 
         dialog.Dispose ();
     }
@@ -195,7 +195,7 @@ public void Arrangement_Default ()
     {
         Dialog dialog = new ();
 
-        Assert.Equal (ViewArrangement.Overlapped, dialog.Arrangement);
+        Assert.Equal (ViewArrangement.Movable | ViewArrangement.Resizable | ViewArrangement.Overlapped, dialog.Arrangement);
 
         dialog.Dispose ();
     }
@@ -415,12 +415,12 @@ public void ShadowStyle_Can_Be_Changed ()
 
     // Copilot
     [Fact]
-    public void SchemeName_IsBase_WhenNotRunning ()
+    public void SchemeName_IsDialog_WhenNotRunning ()
     {
-        // When a Dialog is not running, it should use the Base scheme (not Dialog)
+        // A Dialog uses the Dialog scheme by default, set in the constructor
         Dialog dialog = new ();
 
-        Assert.Equal (SchemeManager.SchemesToSchemeName (Schemes.Base), dialog.SchemeName);
+        Assert.Equal (SchemeManager.SchemesToSchemeName (Schemes.Dialog), dialog.SchemeName);
 
         dialog.Dispose ();
     }
@@ -452,6 +452,43 @@ void AppOnIteration (object? sender, EventArgs<IApplication?> e)
         }
     }
 
+    // Copilot
+    [Fact]
+    public void Custom_SchemeName_And_Arrangement_Are_Not_Overwritten_By_Run ()
+    {
+        using IApplication app = Application.Create ();
+        app.Init (DriverRegistry.Names.ANSI);
+
+        using Dialog dialog = new ();
+        string customSchemeName = SchemeManager.SchemesToSchemeName (Schemes.Base)!;
+        const ViewArrangement customArrangement = ViewArrangement.Overlapped;
+
+        dialog.SchemeName = customSchemeName;
+        dialog.Arrangement = customArrangement;
+
+        string? schemeNameWhileRunning = null;
+        ViewArrangement arrangementWhileRunning = default;
+
+        app.Iteration += AppOnIteration;
+        app.Run (dialog);
+        app.Iteration -= AppOnIteration;
+
+        Assert.Equal (customSchemeName, schemeNameWhileRunning);
+        Assert.Equal (customArrangement, arrangementWhileRunning);
+        Assert.Equal (customSchemeName, dialog.SchemeName);
+        Assert.Equal (customArrangement, dialog.Arrangement);
+
+        return;
+
+        void AppOnIteration (object? sender, EventArgs<IApplication?> e)
+        {
+            schemeNameWhileRunning = dialog.SchemeName;
+            arrangementWhileRunning = dialog.Arrangement;
+            app.Iteration -= AppOnIteration;
+            app.RequestStop ();
+        }
+    }
+
     [Fact]
     public void Text_Property ()
     {