From e554b222dafb4488dddd8d96437a75349b3529c8 Mon Sep 17 00:00:00 2001 From: Sunny Date: Thu, 27 Jul 2023 17:26:10 +0800 Subject: [PATCH] =?UTF-8?q?*=20UIFormHelper:=20=E6=8F=90=E9=97=AE=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=98=AF=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=88=96=E8=80=85=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=9A=84=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SunnyUI/Forms/UIForm.cs | 4 ++-- SunnyUI/Forms/UIFormHelper.cs | 8 ++++---- SunnyUI/Forms/UIMessageForm.cs | 11 +++++------ SunnyUI/Frames/UIPage.cs | 4 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/SunnyUI/Forms/UIForm.cs b/SunnyUI/Forms/UIForm.cs index f2a3e0fd..27b5f7ed 100644 --- a/SunnyUI/Forms/UIForm.cs +++ b/SunnyUI/Forms/UIForm.cs @@ -1971,7 +1971,7 @@ namespace Sunny.UI /// 信息 /// 显示遮罩层 /// 结果 - public bool ShowAskDialog(string msg, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok, bool showMask = false) + public bool ShowAskDialog(string msg, bool showMask = false, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok) { return UIMessageDialog.ShowMessageDialog(msg, UILocalize.AskTitle, true, UIStyle.Blue, showMask, true, defaultButton); } @@ -2032,7 +2032,7 @@ namespace Sunny.UI /// 主题 /// 显示遮罩层 /// 结果 - public bool ShowAskDialog(string title, string msg, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok, UIStyle style = UIStyle.Blue, bool showMask = false) + public bool ShowAskDialog(string title, string msg, UIStyle style = UIStyle.Blue, bool showMask = false, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok) { return UIMessageDialog.ShowMessageDialog(msg, title, true, style, showMask, true, defaultButton); } diff --git a/SunnyUI/Forms/UIFormHelper.cs b/SunnyUI/Forms/UIFormHelper.cs index a29d556d..ea279b9c 100644 --- a/SunnyUI/Forms/UIFormHelper.cs +++ b/SunnyUI/Forms/UIFormHelper.cs @@ -23,7 +23,7 @@ * 2021-12-13: V3.0.9 增加全屏遮罩，Form的ShowDialogWithMask()扩展方法 * 2022-07-17: V3.2.1 解决ShowNotifier打开多个，全部关闭时出错的问题 * 2023-07-27: V3.4.1 默认提示弹窗TopMost为true - * 2023-07-27: V3.4.1 提问弹窗增加可选择默认是确认或者取消按钮的选择 + * 2023-07-27: V3.4.1 提问弹窗增加默认是确认或者取消按钮的选择 ******************************************************************************/ using System; @@ -178,9 +178,9 @@ namespace Sunny.UI /// 信息 /// /// 结果 - public static bool ShowAskDialog(this Form form, string msg, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok, UIStyle style = UIStyle.Blue) + public static bool ShowAskDialog(this Form form, string msg, UIStyle style = UIStyle.Blue, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok) { - return form.ShowAskDialog(UILocalize.AskTitle, msg, defaultButton, style); + return form.ShowAskDialog(UILocalize.AskTitle, msg, style, defaultButton); } /// @@ -191,7 +191,7 @@ namespace Sunny.UI /// 信息 /// /// 结果 - public static bool ShowAskDialog(this Form form, string title, string msg, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok, UIStyle style = UIStyle.Blue) + public static bool ShowAskDialog(this Form form, string title, string msg, UIStyle style = UIStyle.Blue, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok) { return form.ShowMessageDialog(msg, title, true, style); } diff --git a/SunnyUI/Forms/UIMessageForm.cs b/SunnyUI/Forms/UIMessageForm.cs index c990c68e..eb360dde 100644 --- a/SunnyUI/Forms/UIMessageForm.cs +++ b/SunnyUI/Forms/UIMessageForm.cs @@ -183,13 +183,12 @@ namespace Sunny.UI private void UIMessageForm_Shown(object sender, EventArgs e) { - if (!ShowCancel || DefaultButton == UIMessageDialogButtons.Ok) + if (ShowCancel) { - btnOK.Focus(); - } - else - { - btnCancel.Focus(); + if (DefaultButton == UIMessageDialogButtons.Ok) + btnOK.Focus(); + else + btnCancel.Focus(); } } } diff --git a/SunnyUI/Frames/UIPage.cs b/SunnyUI/Frames/UIPage.cs index 874725ff..7364e27a 100644 --- a/SunnyUI/Frames/UIPage.cs +++ b/SunnyUI/Frames/UIPage.cs @@ -1233,7 +1233,7 @@ namespace Sunny.UI /// 信息 /// 显示遮罩层 /// 结果 - public bool ShowAskDialog(string msg, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok, bool showMask = false) + public bool ShowAskDialog(string msg, bool showMask = false, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok) { return UIMessageDialog.ShowMessageDialog(msg, UILocalize.AskTitle, true, UIStyle.Blue, showMask, true, defaultButton); } @@ -1294,7 +1294,7 @@ namespace Sunny.UI /// 主题 /// 显示遮罩层 /// 结果 - public bool ShowAskDialog(string title, string msg, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok, UIStyle style = UIStyle.Blue, bool showMask = false) + public bool ShowAskDialog(string title, string msg, UIStyle style = UIStyle.Blue, bool showMask = false, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok) { return UIMessageDialog.ShowMessageDialog(msg, title, true, style, showMask, true, defaultButton); }