zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* UIMessageForm2: 统一配色

Browse Source
This commit is contained in:
Sunny 2024-06-08 22:36:04 +08:00
parent 945f6911ad
commit 2b356290e6
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SunnyUI/Forms/UIFormHelper.cs
View File

@ -556,7 +556,7 @@ namespace Sunny.UI
/// <param name="showMask">显示遮罩层</param> /// <param name="showMask">显示遮罩层</param>
public static void ShowInfoDialog(this Form form, string msg, bool showMask = false, int delay = 0) 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> /// <summary>
@ -623,7 +623,7 @@ namespace Sunny.UI
/// <returns>结果</returns> /// <returns>结果</returns>
public static bool ShowAskDialog(this Form form, string msg, bool showMask = false, UIMessageDialogButtons defaultButton = UIMessageDialogButtons.Ok) 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> /// <summary>

22
SunnyUI/Forms/UIMessageForm2.cs
View File

@ -17,6 +17,7 @@
* 创建日期: 2024-05-16 * 创建日期: 2024-05-16
* *
* 2024-05-16: V3.6.6 增加文件说明 * 2024-05-16: V3.6.6 增加文件说明
* 2024-06-08: V3.6.6 统一配色
******************************************************************************/ ******************************************************************************/
using System.Drawing; using System.Drawing;
@ -34,14 +35,7 @@ namespace Sunny.UI
btnCancel.Text = UILocalize.Cancel; btnCancel.Text = UILocalize.Cancel;
foreColor = Color.Black; 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) if (noteType != UINotifierType.Ask)
{ {
@ -60,6 +54,7 @@ namespace Sunny.UI
switch (noteType) switch (noteType)
{ {
case UINotifierType.ERROR: case UINotifierType.ERROR:
btnOK.Style = Style = UIStyle.Red;
Symbol = 361527; Symbol = 361527;
SymbolColor = UIStyles.Red.ButtonFillColor; SymbolColor = UIStyles.Red.ButtonFillColor;
break; break;
@ -70,11 +65,13 @@ namespace Sunny.UI
break; break;
case UINotifierType.WARNING: case UINotifierType.WARNING:
btnOK.Style = Style = UIStyle.Orange;
Symbol = 361553; Symbol = 361553;
SymbolColor = UIStyles.Orange.ButtonFillColor; SymbolColor = UIStyles.Orange.ButtonFillColor;
break; break;
case UINotifierType.OK: case UINotifierType.OK:
btnOK.Style = Style = UIStyle.Green;
Symbol = 361528; Symbol = 361528;
SymbolColor = UIStyles.Green.ButtonFillColor; SymbolColor = UIStyles.Green.ButtonFillColor;
break; break;
@ -94,6 +91,15 @@ namespace Sunny.UI
public string Message { get; set; } public string Message { get; set; }
private void UIMessageForm2_Paint(object sender, System.Windows.Forms.PaintEventArgs e) 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; int height = (190 - 48 + TitleHeight) + label1.Height;
if (height > 210) Height = height; if (height > 210) Height = height;
e.Graphics.FillRectangle(Color, new RectangleF(0, Height - 76, Width, 76)); e.Graphics.FillRectangle(Color, new RectangleF(0, Height - 76, Width, 76));

4
SunnyUI/SunnyUI.csproj
View File

@ -78,9 +78,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="Forms\UIForm2.cs"> <Compile Update="Forms\UIForm2.cs" />
<SubType>Form</SubType>
</Compile>
<Compile Update="Properties\Resources.Designer.cs"> <Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>