Merge pull request #1839 from Krypton-Suite/1837-bug-kryptonmessagebo…

…xdefaultbuttonbutton2-doesnt-work-v85 * Resolved #1837 - V85
Krypton-Suite · Nov 9, 2024 · 343d1b3 · 343d1b3
2 parents 6356616 + 3408a25
commit 343d1b3
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 8 deletions.
diff --git a/Documents/Help/Changelog.md b/Documents/Help/Changelog.md
@@ -1,8 +1,12 @@
 # <img src="https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/Krypton.png?raw=true"> Standard Toolkit - ChangeLog
 
 =======
+
 # 2024-11-14 - Build 2411 (Patch 4) - November 2024
-* Resolved [#1820](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1820), When KryptonDataGridView.AutoGenerate is set Winforms columns are used. See the issue for full text.
+* Resolved [#1837](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1837), `KryptonMessageBoxDefaultButton.Button2` doesn't work
+* Resolved [#1820](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1820), When KryptonDataGridView.AutoGenerate is set WinForms columns are used. See the issue for full text.
+
+=======
 
 # 2024-10-14 - Build 2410 (Patch 3) - October 2024
 * Implemented [#1813](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1813), LTS Configuration

diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBox.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBox.cs
@@ -367,6 +367,8 @@ private static DialogResult ShowCore(IWin32Window? owner,
 
             kmb.StartPosition = showOwner == null ? FormStartPosition.CenterScreen : FormStartPosition.CenterParent;
 
+            (kmb.AcceptButton as KryptonButton)?.Select();
+
             return kmb.ShowDialog(showOwner);
         }
 

diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/KryptonMessageBoxForm.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Visuals/KryptonMessageBoxForm.cs
@@ -480,25 +480,23 @@ private void UpdateDefault()
             switch (_defaultButton)
             {
                 case KryptonMessageBoxDefaultButton.Button1:
-                    //_button1.Select();
+                    _button1.Select();
                     AcceptButton = _button1;
                     break;
                 case KryptonMessageBoxDefaultButton.Button2:
-                    //_button2.Select();
+                    _button2.Select();
                     AcceptButton = _button2;
                     break;
                 case KryptonMessageBoxDefaultButton.Button3:
-                    //_button3.Select();
+                    _button3.Select();
                     AcceptButton = _button3;
                     break;
                 case KryptonMessageBoxDefaultButton.Button4:
+                    _button4.Select();
                     AcceptButton = _showHelpButton ? _button4 : _button1;
-                    break;
-                case KryptonMessageBoxDefaultButton.Button5:
-                    AcceptButton = _showActionButton ? _button5 : _button1;
-
                     break;
                 default:
+                    _button1.Select();
                     AcceptButton = _showHelpButton ? _button4 : _button1;
                     break;
             }

diff --git a/Source/Krypton Components/TestForm/Form1.Designer.cs b/Source/Krypton Components/TestForm/Form1.Designer.cs
diff --git a/Source/Krypton Components/TestForm/Form1.cs b/Source/Krypton Components/TestForm/Form1.cs
@@ -309,5 +309,11 @@ private void kcbtnFormBorderStyleSizableToolWindow_Click(object sender, EventArg
         {
             UpdateFormBorderStyle(FormBorderStyle.SizableToolWindow);
         }
+
+        private void kryptonButton9_Click(object sender, EventArgs e)
+        {
+            KryptonMessageBox.Show("question?", "title", KryptonMessageBoxButtons.YesNo,
+                KryptonMessageBoxIcon.Warning, KryptonMessageBoxDefaultButton.Button2);
+        }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -367,6 +367,8 @@ private static DialogResult ShowCore(IWin32Window? owner, @@
                 kmb.StartPosition = showOwner == null ? FormStartPosition.CenterScreen : FormStartPosition.CenterParent;
+                (kmb.AcceptButton as KryptonButton)?.Select();
                 return kmb.ShowDialog(showOwner);
             }
@@ Expand Down @@