From efae9abc41b737bfaf4fe6afefeb2cb4160fcece Mon Sep 17 00:00:00 2001
From: BDisp <bd.bdisp@gmail.com>
Date: Fri, 10 Mar 2023 19:26:58 +0000
Subject: [PATCH] Doing the fix in the MessageBox instead on the scenario.

---
 Terminal.Gui/Windows/MessageBox.cs  |  6 ++++++
 UICatalog/Scenarios/MessageBoxes.cs | 12 ------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Terminal.Gui/Windows/MessageBox.cs b/Terminal.Gui/Windows/MessageBox.cs
index a50a71f65..5014336c2 100644
--- a/Terminal.Gui/Windows/MessageBox.cs
+++ b/Terminal.Gui/Windows/MessageBox.cs
@@ -290,6 +290,12 @@ namespace Terminal.Gui {
 
 			if (useErrorColors) {
 				d.ColorScheme = Colors.Error;
+				border.BorderBrush = Colors.Error.Normal.Foreground;
+				border.Background = Colors.Error.Normal.Background;
+			} else {
+				d.ColorScheme = Colors.Dialog;
+				d.Border.BorderBrush = Colors.Dialog.Normal.Foreground;
+				d.Border.Background = Colors.Dialog.Normal.Background;
 			}
 
 			if (!ustring.IsNullOrEmpty (message)) {
diff --git a/UICatalog/Scenarios/MessageBoxes.cs b/UICatalog/Scenarios/MessageBoxes.cs
index 3ba0f500f..807af3a98 100644
--- a/UICatalog/Scenarios/MessageBoxes.cs
+++ b/UICatalog/Scenarios/MessageBoxes.cs
@@ -143,18 +143,6 @@ namespace UICatalog.Scenarios {
 				X = Pos.Right (label) + 1,
 				Y = Pos.Top (label),
 			};
-			styleRadioGroup.SelectedItemChanged += e => {
-				switch (e.SelectedItem) {
-				case 0:
-					border.BorderBrush = Colors.Dialog.Normal.Foreground;
-					border.Background = Colors.Dialog.Normal.Background;
-					break;
-				case 1:
-					border.BorderBrush = Colors.Error.Normal.Foreground;
-					border.Background = Colors.Error.Normal.Background;
-					break;
-				}
-			};
 			frame.Add (styleRadioGroup);
 
 			var ckbEffect3D = new CheckBox ("Effect3D", true) {