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

* UIForm：更新窗体控制按钮圆角和跟随窗体圆角变化。

Browse Source
This commit is contained in:
Sunny 2020-07-05 23:39:35 +08:00
parent 2ca8303735
commit 11a2cdab91
7 changed files with 58 additions and 16 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.

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

@ -99,6 +99,7 @@
this.ClientSize = new System.Drawing.Size(1024, 720);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FMain";
this.ShowRadius = false;
this.Text = "SunnyUI.Net";
this.WindowStateChange += new Sunny.UI.UIForm.OnWindowStateChange(this.FMain_WindowStateChange);
this.Header.ResumeLayout(false);

15
SunnyUI/Forms/UIForm.cs
View File

@ -798,7 +798,10 @@ namespace Sunny.UI
{
if (InControlBox)
{
e.Graphics.FillRoundRectangle(UIColor.Red, ControlBoxRect, 5);
if (ShowRadius)
e.Graphics.FillRoundRectangle(UIColor.Red, ControlBoxRect, 5);
else
e.Graphics.FillRectangle(UIColor.Red, ControlBoxRect);
}
//e.Graphics.DrawFontImage(61453, 24, Color.White, ControlBoxRect, 1);
@ -819,7 +822,10 @@ namespace Sunny.UI
{
if (InMaxBox)
{
e.Graphics.FillRoundRectangle(btn.FillHoverColor, MaximizeBoxRect, 5);
if (ShowRadius)
e.Graphics.FillRoundRectangle(btn.FillHoverColor, MaximizeBoxRect, 5);
else
e.Graphics.FillRectangle(btn.FillHoverColor, MaximizeBoxRect);
}
// e.Graphics.DrawFontImage(
@ -872,7 +878,10 @@ namespace Sunny.UI
{
if (InMinBox)
{
e.Graphics.FillRoundRectangle(btn.FillHoverColor, MinimizeBoxRect, 5);
if (ShowRadius)
e.Graphics.FillRoundRectangle(btn.FillHoverColor, MinimizeBoxRect, 5);
else
e.Graphics.FillRectangle(btn.FillHoverColor, MinimizeBoxRect);
}
e.Graphics.DrawLine(Color.White,

58
SunnyUI/Static/UGDI.cs
View File

@ -381,20 +381,38 @@ namespace Sunny.UI
public static void DrawRoundRectangle(this Graphics g, Pen pen, Rectangle rect, int cornerRadius, bool smooth = true)
{
using (GraphicsPath path = CreateRoundedRectanglePath(rect, cornerRadius))
if (cornerRadius > 0)
{
using (GraphicsPath path = CreateRoundedRectanglePath(rect, cornerRadius))
{
g.Smooth(smooth);
g.DrawPath(pen, path);
g.Smooth(false);
}
}
else
{
g.Smooth(smooth);
g.DrawPath(pen, path);
g.DrawRectangle(pen, rect);
g.Smooth(false);
}
}
public static void FillRoundRectangle(this Graphics g, Brush brush, Rectangle rect, int cornerRadius, bool smooth = true)
{
using (GraphicsPath path = CreateRoundedRectanglePath(rect, cornerRadius))
if (cornerRadius > 0)
{
using (GraphicsPath path = CreateRoundedRectanglePath(rect, cornerRadius))
{
g.Smooth(smooth);
g.FillPath(brush, path);
g.Smooth(false);
}
}
else
{
g.Smooth(smooth);
g.FillPath(brush, path);
g.FillRectangle(brush, rect);
g.Smooth(false);
}
}
@ -411,17 +429,31 @@ namespace Sunny.UI
public static void DrawRoundRectangle(this Graphics g, Color color, Rectangle rect, int cornerRadius, bool smooth = true)
{
using (GraphicsPath path = CreateRoundedRectanglePath(rect, cornerRadius))
if (cornerRadius > 0)
{
g.DrawPath(color, path, smooth);
using (GraphicsPath path = CreateRoundedRectanglePath(rect, cornerRadius))
{
g.DrawPath(color, path, smooth);
}
}
else
{
g.DrawRectangle(color, rect, smooth);
}
}
public static void FillRoundRectangle(this Graphics g, Color color, Rectangle rect, int cornerRadius, bool smooth = true)
{
using (GraphicsPath path = CreateRoundedRectanglePath(rect, cornerRadius))
if (cornerRadius > 0)
{
g.FillPath(color, path, smooth);
using (GraphicsPath path = CreateRoundedRectanglePath(rect, cornerRadius))
{
g.FillPath(color, path, smooth);
}
}
else
{
g.FillRectangle(color, rect, smooth);
}
}
@ -482,7 +514,7 @@ namespace Sunny.UI
public static GraphicsPath CreateFanPath(this Point center, float d1, float d2, float startAngle, float sweepAngle)
{
return new PointF(center.X,center.Y).CreateFanPath(d1,d2,startAngle,sweepAngle);
return new PointF(center.X, center.Y).CreateFanPath(d1, d2, startAngle, sweepAngle);
}
public static GraphicsPath CreateFanPath(this PointF center, float d1, float d2, float startAngle, float sweepAngle)
@ -666,12 +698,12 @@ namespace Sunny.UI
}
}
public static void DrawString(this Graphics g, string s, Font font, Color color,
public static void DrawString(this Graphics g, string s, Font font, Color color,
RectangleF layoutRectangle, StringFormat format, float angle)
{
using (Brush br= new SolidBrush(color))
using (Brush br = new SolidBrush(color))
{
g.DrawString(s,font,br,layoutRectangle,format,angle);
g.DrawString(s, font, br, layoutRectangle, format, angle);
}
}
@ -680,7 +712,7 @@ namespace Sunny.UI
{
using (Brush br = new SolidBrush(color))
{
g.DrawString(s,font,br,point,format,angle);
g.DrawString(s, font, br, point, format, angle);
}
}