From 0c788cdadc24b1ad55fd1a675a547baa7f8562c7 Mon Sep 17 00:00:00 2001
From: Tig <tig@users.noreply.github.com>
Date: Tue, 13 Jan 2026 11:48:39 -0700
Subject: [PATCH 1/2] fixed and disabled

---
 Terminal.Gui/Views/Dialog.cs     | 8 ++++----
 Terminal.Gui/Views/MessageBox.cs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Terminal.Gui/Views/Dialog.cs b/Terminal.Gui/Views/Dialog.cs
index 6db8083b04..e1d6337342 100644
--- a/Terminal.Gui/Views/Dialog.cs
+++ b/Terminal.Gui/Views/Dialog.cs
@@ -94,6 +94,8 @@ public Dialog ()
         BorderStyle = DefaultBorderStyle;
         base.ShadowStyle = DefaultShadow;
 
+        SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Dialog);
+
         _buttonContainer = new ()
         {
             Id = "Dialog.ButtonContainer",
@@ -101,8 +103,7 @@ public Dialog ()
             X = 0,
             Y = Pos.AnchorEnd (),
             Width = Dim.Fill (),
-            Height = Dim.Auto (),
-            SchemeName = "Menu"
+            Height = Dim.Auto ()
         };
         Padding!.Add (_buttonContainer);
 
@@ -345,8 +346,7 @@ private void SetStyle ()
     {
         if (IsRunning)
         {
-            SchemeName = SchemeManager.SchemesToSchemeName (Schemes.Dialog);
-            Padding!.SetScheme (SchemeManager.GetScheme (Schemes.Base));
+            //Padding!.SetScheme (SchemeManager.GetScheme (Schemes.Base));
             Arrangement |= ViewArrangement.Movable | ViewArrangement.Resizable | ViewArrangement.Overlapped;
         }
         else
diff --git a/Terminal.Gui/Views/MessageBox.cs b/Terminal.Gui/Views/MessageBox.cs
index 7ae572d6b0..4055fa85b9 100644
--- a/Terminal.Gui/Views/MessageBox.cs
+++ b/Terminal.Gui/Views/MessageBox.cs
@@ -276,7 +276,7 @@ params string [] buttons
         dialog.ButtonAlignment = DefaultButtonAlignment;
         dialog.BorderStyle = DefaultBorderStyle;
 
-        dialog.SchemeName = useErrorScheme ? SchemeManager.SchemesToSchemeName (Schemes.Error) : SchemeManager.SchemesToSchemeName (Schemes.Dialog);
+        //dialog.SchemeName = useErrorScheme ? SchemeManager.SchemesToSchemeName (Schemes.Error) : SchemeManager.SchemesToSchemeName (Schemes.Dialog);
 
         dialog.HotKeySpecifier = new ('\xFFFF');
         dialog.Text = message;

From 0a9095d3e27a4e84f6023a395d4f2648aad779a0 Mon Sep 17 00:00:00 2001
From: Tig <tig@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:43:03 -0700
Subject: [PATCH 2/2] Fix MessageBox not setting SchemeName correctly

Uncommented line in MessageBox.cs that sets the SchemeName property based on whether it's an error dialog or regular dialog. Added unit tests to verify Query sets "Dialog" scheme and ErrorQuery sets "Error" scheme.

Fixes #4567

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 Terminal.Gui/Views/MessageBox.cs              |  2 +-
 .../Views/MessageBoxTests.cs                  | 76 +++++++++++++++++++
 2 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/Terminal.Gui/Views/MessageBox.cs b/Terminal.Gui/Views/MessageBox.cs
index 4055fa85b9..7ae572d6b0 100644
--- a/Terminal.Gui/Views/MessageBox.cs
+++ b/Terminal.Gui/Views/MessageBox.cs
@@ -276,7 +276,7 @@ params string [] buttons
         dialog.ButtonAlignment = DefaultButtonAlignment;
         dialog.BorderStyle = DefaultBorderStyle;
 
-        //dialog.SchemeName = useErrorScheme ? SchemeManager.SchemesToSchemeName (Schemes.Error) : SchemeManager.SchemesToSchemeName (Schemes.Dialog);
+        dialog.SchemeName = useErrorScheme ? SchemeManager.SchemesToSchemeName (Schemes.Error) : SchemeManager.SchemesToSchemeName (Schemes.Dialog);
 
         dialog.HotKeySpecifier = new ('\xFFFF');
         dialog.Text = message;
diff --git a/Tests/UnitTestsParallelizable/Views/MessageBoxTests.cs b/Tests/UnitTestsParallelizable/Views/MessageBoxTests.cs
index e0f6acca25..e630d76a46 100644
--- a/Tests/UnitTestsParallelizable/Views/MessageBoxTests.cs
+++ b/Tests/UnitTestsParallelizable/Views/MessageBoxTests.cs
@@ -77,4 +77,80 @@ public static IEnumerable<object []> AcceptingKeys ()
         yield return [Key.Enter];
         yield return [Key.Space];
     }
+
+    // Claude - Opus 4.5
+    [Fact]
+    public void Query_Sets_Dialog_SchemeName ()
+    {
+        IApplication app = Application.Create ();
+        app.Init (DriverRegistry.Names.ANSI);
+
+        try
+        {
+            string? schemeName = null;
+            var iteration = 0;
+
+            app.Iteration += OnApplicationOnIteration;
+            int? result = MessageBox.Query (app, "Test", "Message", "OK");
+            app.Iteration -= OnApplicationOnIteration;
+
+            Assert.Equal ("Dialog", schemeName);
+
+            void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
+            {
+                iteration++;
+
+                if (iteration == 1)
+                {
+                    // Capture the SchemeName from the running dialog
+                    var dialog = app.TopRunnableView as Dialog;
+                    Assert.NotNull (dialog);
+                    schemeName = dialog.SchemeName;
+                    app.RequestStop ();
+                }
+            }
+        }
+        finally
+        {
+            app.Dispose ();
+        }
+    }
+
+    // Claude - Opus 4.5
+    [Fact]
+    public void ErrorQuery_Sets_Error_SchemeName ()
+    {
+        IApplication app = Application.Create ();
+        app.Init (DriverRegistry.Names.ANSI);
+
+        try
+        {
+            string? schemeName = null;
+            var iteration = 0;
+
+            app.Iteration += OnApplicationOnIteration;
+            int? result = MessageBox.ErrorQuery (app, "Error", "Error Message", "OK");
+            app.Iteration -= OnApplicationOnIteration;
+
+            Assert.Equal ("Error", schemeName);
+
+            void OnApplicationOnIteration (object? s, EventArgs<IApplication?> a)
+            {
+                iteration++;
+
+                if (iteration == 1)
+                {
+                    // Capture the SchemeName from the running dialog
+                    var dialog = app.TopRunnableView as Dialog;
+                    Assert.NotNull (dialog);
+                    schemeName = dialog.SchemeName;
+                    app.RequestStop ();
+                }
+            }
+        }
+        finally
+        {
+            app.Dispose ();
+        }
+    }
 }