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

* 修改最大化全屏时消息窗体弹出在窗体后的BUG

Browse Source
This commit is contained in:
Sunny 2020-07-01 21:05:30 +08:00
parent fd31b488bb
commit 02e981c327
7 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/SunnyUI.pdb
View File

Binary file not shown.

BIN
SunnyUI.Demo/Bin/SunnyUI.Demo.exe
View File

Binary file not shown.

BIN
SunnyUI.Demo/Bin/SunnyUI.dll
View File

Binary file not shown.

2
SunnyUI.Demo/FMain.Designer.cs generated
View File

@ -99,7 +99,9 @@
this.ClientSize = new System.Drawing.Size(1024, 720); this.ClientSize = new System.Drawing.Size(1024, 720);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FMain"; this.Name = "FMain";
this.ShowFullScreen = true;
this.Text = "SunnyUI.Net"; this.Text = "SunnyUI.Net";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.WindowStateChange += new Sunny.UI.UIForm.OnWindowStateChange(this.FMain_WindowStateChange); this.WindowStateChange += new Sunny.UI.UIForm.OnWindowStateChange(this.FMain_WindowStateChange);
this.Header.ResumeLayout(false); this.Header.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);

3
SunnyUI/Forms/UIForm.cs
View File

@ -501,7 +501,7 @@ namespace Sunny.UI
Left = screen.Bounds.Left; Left = screen.Bounds.Left;
Top = screen.Bounds.Top; Top = screen.Bounds.Top;
SetFormRoundRectRegion(this, 0); SetFormRoundRectRegion(this, 0);
TopMost = ShowFullScreen; if (ShowFullScreen) base.WindowState = FormWindowState.Maximized;
windowState = FormWindowState.Maximized; windowState = FormWindowState.Maximized;
WindowStateChange?.Invoke(this, FormWindowState.Maximized); WindowStateChange?.Invoke(this, FormWindowState.Maximized);
} }
@ -520,6 +520,7 @@ namespace Sunny.UI
Location = StartPosition == FormStartPosition.CenterScreen ? center : location; Location = StartPosition == FormStartPosition.CenterScreen ? center : location;
SetFormRoundRectRegion(this, ShowRadius ? 5 : 0); SetFormRoundRectRegion(this, ShowRadius ? 5 : 0);
windowState = FormWindowState.Normal; windowState = FormWindowState.Normal;
base.WindowState = FormWindowState.Normal;
WindowStateChange?.Invoke(this, FormWindowState.Normal); WindowStateChange?.Invoke(this, FormWindowState.Normal);
} }

31
SunnyUI/Forms/UIFormHelper.cs
View File

@ -37,7 +37,7 @@ namespace Sunny.UI
/// <param name="style">主题</param> /// <param name="style">主题</param>
public static void ShowSuccessDialog(this Form form, string msg, UIStyle style = UIStyle.Green) public static void ShowSuccessDialog(this Form form, string msg, UIStyle style = UIStyle.Green)
{ {
ShowMessageDialog(msg, UILocalize.SuccessTitle, false, style); form.ShowMessageDialog(msg, UILocalize.SuccessTitle, false, style);
} }
/// <summary> /// <summary>
@ -48,7 +48,7 @@ namespace Sunny.UI
/// <param name="style">主题</param> /// <param name="style">主题</param>
public static void ShowInfoDialog(this Form form, string msg, UIStyle style = UIStyle.Gray) public static void ShowInfoDialog(this Form form, string msg, UIStyle style = UIStyle.Gray)
{ {
ShowMessageDialog(msg, UILocalize.InfoTitle, false, style); form.ShowMessageDialog(msg, UILocalize.InfoTitle, false, style);
} }
/// <summary> /// <summary>
@ -59,7 +59,7 @@ namespace Sunny.UI
/// <param name="style">主题</param> /// <param name="style">主题</param>
public static void ShowWarningDialog(this Form form, string msg, UIStyle style = UIStyle.Orange) public static void ShowWarningDialog(this Form form, string msg, UIStyle style = UIStyle.Orange)
{ {
ShowMessageDialog(msg, UILocalize.WarningTitle, false, style); form.ShowMessageDialog(msg, UILocalize.WarningTitle, false, style);
} }
/// <summary> /// <summary>
@ -70,7 +70,7 @@ namespace Sunny.UI
/// <param name="style">主题</param> /// <param name="style">主题</param>
public static void ShowErrorDialog(this Form form, string msg, UIStyle style = UIStyle.Red) public static void ShowErrorDialog(this Form form, string msg, UIStyle style = UIStyle.Red)
{ {
ShowMessageDialog(msg, UILocalize.ErrorTitle, false, style); form.ShowMessageDialog(msg, UILocalize.ErrorTitle, false, style);
} }
/// <summary> /// <summary>
@ -82,7 +82,7 @@ namespace Sunny.UI
/// <returns>结果</returns> /// <returns>结果</returns>
public static bool ShowAskDialog(this Form form, string msg, UIStyle style = UIStyle.Blue) public static bool ShowAskDialog(this Form form, string msg, UIStyle style = UIStyle.Blue)
{ {
return ShowMessageDialog(msg, UILocalize.AskTitle, true, style); return form.ShowMessageDialog(msg, UILocalize.AskTitle, true, style);
} }
/// <summary> /// <summary>
@ -94,7 +94,7 @@ namespace Sunny.UI
/// <param name="style">主题</param> /// <param name="style">主题</param>
public static void ShowSuccessDialog(this Form form, string title, string msg, UIStyle style = UIStyle.Green) public static void ShowSuccessDialog(this Form form, string title, string msg, UIStyle style = UIStyle.Green)
{ {
ShowMessageDialog(msg, title, false, style); form.ShowMessageDialog(msg, title, false, style);
} }
/// <summary> /// <summary>
@ -106,7 +106,7 @@ namespace Sunny.UI
/// <param name="style">主题</param> /// <param name="style">主题</param>
public static void ShowInfoDialog(this Form form, string title, string msg, UIStyle style = UIStyle.Gray) public static void ShowInfoDialog(this Form form, string title, string msg, UIStyle style = UIStyle.Gray)
{ {
ShowMessageDialog(msg, title, false, style); form.ShowMessageDialog(msg, title, false, style);
} }
/// <summary> /// <summary>
@ -118,7 +118,7 @@ namespace Sunny.UI
/// <param name="style">主题</param> /// <param name="style">主题</param>
public static void ShowWarningDialog(this Form form, string title, string msg, UIStyle style = UIStyle.Orange) public static void ShowWarningDialog(this Form form, string title, string msg, UIStyle style = UIStyle.Orange)
{ {
ShowMessageDialog(msg, title, false, style); form.ShowMessageDialog(msg, title, false, style);
} }
/// <summary> /// <summary>
@ -130,7 +130,7 @@ namespace Sunny.UI
/// <param name="style">主题</param> /// <param name="style">主题</param>
public static void ShowErrorDialog(this Form form, string title, string msg, UIStyle style = UIStyle.Red) public static void ShowErrorDialog(this Form form, string title, string msg, UIStyle style = UIStyle.Red)
{ {
ShowMessageDialog(msg, title, false, style); form.ShowMessageDialog(msg, title, false, style);
} }
/// <summary> /// <summary>
@ -143,7 +143,18 @@ namespace Sunny.UI
/// <returns>结果</returns> /// <returns>结果</returns>
public static bool ShowAskDialog(this Form form, string title, string msg, UIStyle style = UIStyle.Blue) public static bool ShowAskDialog(this Form form, string title, string msg, UIStyle style = UIStyle.Blue)
{ {
return ShowMessageDialog(msg, title, true, style); return form.ShowMessageDialog(msg, title, true, style);
}
public static bool ShowMessageDialog(this Form form, string message, string title, bool isShowCancel, UIStyle style)
{
UIMessageForm frm = new UIMessageForm();
frm.TopMost = form.TopMost;
frm.ShowMessage(message, title, isShowCancel, style);
frm.ShowDialog();
bool isOk = frm.IsOK;
frm.Dispose();
return isOk;
} }
public static bool ShowMessageDialog(string message, string title, bool isShowCancel, UIStyle style) public static bool ShowMessageDialog(string message, string title, bool isShowCancel, UIStyle style)