From 2b356290e626c1c513858de38505815dd75046ae Mon Sep 17 00:00:00 2001
From: Sunny <yhuse@163.com>
Date: Sat, 8 Jun 2024 22:36:04 +0800
Subject: [PATCH] =?UTF-8?q?*=20UIMessageForm2:=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E9=85=8D=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SunnyUI/Forms/UIFormHelper.cs   |  4 ++--
 SunnyUI/Forms/UIMessageForm2.cs | 22 ++++++++++++++--------
 SunnyUI/SunnyUI.csproj          |  4 +---
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/SunnyUI/Forms/UIFormHelper.cs b/SunnyUI/Forms/UIFormHelper.cs
index d6773ce4..a6701e7e 100644
--- a/SunnyUI/Forms/UIFormHelper.cs
+++ b/SunnyUI/Forms/UIFormHelper.cs
@@ -556,7 +556,7 @@ namespace Sunny.UI
         /// <param name="showMask">显示遮罩层</param>
         public static void ShowInfoDialog(this Form form, string msg, bool showMask = false, int delay = 0)
         {
-            form.ShowInfoDialog(UILocalize.InfoTitle, msg, UIStyle.Gray, showMask, delay);
+            form.ShowInfoDialog(UILocalize.InfoTitle, msg, UIStyles.Style, showMask, delay);
         }
 
         /// <summary>
@@ -623,7 +623,7 @@ namespace Sunny.UI
         /// <returns>结果</returns>
         public static bool ShowAskDialog(this Form form, string msg, bool showMask = false, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok)
         {
-            return UIMessageBox.ShowMessageDialog(form, msg, UILocalize.AskTitle, true, UIStyle.Blue, showMask, true, defaultButton);
+            return UIMessageBox.ShowMessageDialog(form, msg, UILocalize.AskTitle, true, UIStyles.Style, showMask, true, defaultButton);
         }
 
         /// <summary>
diff --git a/SunnyUI/Forms/UIMessageForm2.cs b/SunnyUI/Forms/UIMessageForm2.cs
index ccf386e5..97ed0bc5 100644
--- a/SunnyUI/Forms/UIMessageForm2.cs
+++ b/SunnyUI/Forms/UIMessageForm2.cs
@@ -17,6 +17,7 @@
  * 创建日期: 2024-05-16
  *
  * 2024-05-16: V3.6.6 增加文件说明
+ * 2024-06-08: V3.6.6 统一配色
 ******************************************************************************/
 
 using System.Drawing;
@@ -34,14 +35,7 @@ namespace Sunny.UI
             btnCancel.Text = UILocalize.Cancel;
 
             foreColor = Color.Black;
-            Color[] colors = Color.White.GradientColors(UIStyles.ActiveStyleColor.PrimaryColor, 16);
-            Color = colors[2];
-            if (UIStyles.Style == UIStyle.DarkBlue || UIStyles.Style == UIStyle.Black)
-            {
-                Color[] colors1 = UIStyles.ActiveStyleColor.PrimaryColor.GradientColors(Color.Black, 16);
-                Color = colors1[2];
-                foreColor = Color.White;
-            }
+
 
             if (noteType != UINotifierType.Ask)
             {
@@ -60,6 +54,7 @@ namespace Sunny.UI
             switch (noteType)
             {
                 case UINotifierType.ERROR:
+                    btnOK.Style = Style = UIStyle.Red;
                     Symbol = 361527;
                     SymbolColor = UIStyles.Red.ButtonFillColor;
                     break;
@@ -70,11 +65,13 @@ namespace Sunny.UI
                     break;
 
                 case UINotifierType.WARNING:
+                    btnOK.Style = Style = UIStyle.Orange;
                     Symbol = 361553;
                     SymbolColor = UIStyles.Orange.ButtonFillColor;
                     break;
 
                 case UINotifierType.OK:
+                    btnOK.Style = Style = UIStyle.Green;
                     Symbol = 361528;
                     SymbolColor = UIStyles.Green.ButtonFillColor;
                     break;
@@ -94,6 +91,15 @@ namespace Sunny.UI
         public string Message { get; set; }
         private void UIMessageForm2_Paint(object sender, System.Windows.Forms.PaintEventArgs e)
         {
+            Color[] colors = Color.White.GradientColors(TitleColor, 16);
+            Color = colors[2];
+            if (Style == UIStyle.Inherited && (UIStyles.Style == UIStyle.DarkBlue || UIStyles.Style == UIStyle.Black))
+            {
+                Color[] colors1 = UIStyles.ActiveStyleColor.PrimaryColor.GradientColors(Color.Black, 16);
+                Color = colors1[2];
+                foreColor = Color.White;
+            }
+
             int height = (190 - 48 + TitleHeight) + label1.Height;
             if (height > 210) Height = height;
             e.Graphics.FillRectangle(Color, new RectangleF(0, Height - 76, Width, 76));
diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj
index 78be8c85..9e6ef3c1 100644
--- a/SunnyUI/SunnyUI.csproj
+++ b/SunnyUI/SunnyUI.csproj
@@ -78,9 +78,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Compile Update="Forms\UIForm2.cs">
-          <SubType>Form</SubType>
-        </Compile>
+        <Compile Update="Forms\UIForm2.cs" />
         <Compile Update="Properties\Resources.Designer.cs">
             <DesignTime>True</DesignTime>
             <AutoGen>True</AutoGen>