diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe
index f7ec120b..a07b93fd 100644
Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ
diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll
index f5bbb32b..f5e3ec67 100644
Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ
diff --git a/SunnyUI.Demo/Controls/FProcess.designer.cs b/SunnyUI.Demo/Controls/FProcess.designer.cs
index 45bc08bc..7683f676 100644
--- a/SunnyUI.Demo/Controls/FProcess.designer.cs
+++ b/SunnyUI.Demo/Controls/FProcess.designer.cs
@@ -217,7 +217,8 @@ namespace Sunny.UI.Demo
this.uiProcessBar2.Location = new System.Drawing.Point(30, 123);
this.uiProcessBar2.MinimumSize = new System.Drawing.Size(70, 1);
this.uiProcessBar2.Name = "uiProcessBar2";
- this.uiProcessBar2.Size = new System.Drawing.Size(318, 5);
+ this.uiProcessBar2.Radius = 0;
+ this.uiProcessBar2.Size = new System.Drawing.Size(318, 3);
this.uiProcessBar2.TabIndex = 90;
this.uiProcessBar2.Text = "50.0%";
this.uiProcessBar2.Value = 50;
@@ -318,7 +319,7 @@ namespace Sunny.UI.Demo
this.uiProcessBar3.Location = new System.Drawing.Point(527, 325);
this.uiProcessBar3.MinimumSize = new System.Drawing.Size(70, 1);
this.uiProcessBar3.Name = "uiProcessBar3";
- this.uiProcessBar3.Size = new System.Drawing.Size(203, 169);
+ this.uiProcessBar3.Size = new System.Drawing.Size(173, 169);
this.uiProcessBar3.TabIndex = 103;
this.uiProcessBar3.Value = 50;
//
diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj
index cdec9a07..cbc86a81 100644
--- a/SunnyUI.Demo/SunnyUI.Demo.csproj
+++ b/SunnyUI.Demo/SunnyUI.Demo.csproj
@@ -43,8 +43,7 @@
..\Bin\net40\SunnyUI.dll
- False
- ..\Bin\net40\SunnyUI.Common.dll
+ ..\packages\SunnyUI.Common.3.0.8\lib\net40\SunnyUI.Common.dll
diff --git a/SunnyUI/Charts/UILineChart.cs b/SunnyUI/Charts/UILineChart.cs
index a85ccb4d..0235d7e7 100644
--- a/SunnyUI/Charts/UILineChart.cs
+++ b/SunnyUI/Charts/UILineChart.cs
@@ -22,7 +22,8 @@
* 2021-06-18: V3.0.4 显示鼠标点格式更新
* 2021-07-22: V3.0.5 可自定义背景色,增加实时数据的Demo
* 2021-08-23: V3.0.6 增加可只显示点的模式
- * 2021-10-02: V3.0.8 支持数据包括Nan
+ * 2021-10-02: V3.0.8 支持数据包括Nan,修改自定义最大值最小值为无穷时出错的问题
+ * 2021-10-14: V3.0.8 修改图线显示超出范围的问题
******************************************************************************/
using System;
@@ -455,7 +456,6 @@ namespace Sunny.UI
private void DrawPointSymbols(Graphics g)
{
- int idx = 0;
foreach (var series in Option.Series.Values)
{
Color color = series.Color;
@@ -528,8 +528,6 @@ namespace Sunny.UI
g.SetDefaultQuality();
}
-
- idx++;
}
}
diff --git a/SunnyUI/Common/UControl.cs b/SunnyUI/Common/UControl.cs
index 6c9c046e..dd4987ba 100644
--- a/SunnyUI/Common/UControl.cs
+++ b/SunnyUI/Common/UControl.cs
@@ -460,5 +460,15 @@ namespace Sunny.UI
return false;
}
+ public static void Disabled(this Control ctrl)
+ {
+ ctrl.Enabled = false;
+ ctrl.Hide();
+ }
+
+ public static void Invisible(this Control ctrl)
+ {
+ ctrl.Visible = false;
+ }
}
}
\ No newline at end of file
diff --git a/SunnyUI/Controls/UIProcessBar.cs b/SunnyUI/Controls/UIProcessBar.cs
index e7e02b8b..6b5f1001 100644
--- a/SunnyUI/Controls/UIProcessBar.cs
+++ b/SunnyUI/Controls/UIProcessBar.cs
@@ -20,6 +20,7 @@
* 2020-04-19: V2.2.5 增加数值变化事件
* 2021-08-07: V3.0.5 增加垂直方向的进度显示
* 2021-08-14: V3.0.6 修改不显示百分比时,显示数值
+ * 2021-10-14: V3.0.8 调整最小高度为3
******************************************************************************/
using System;
@@ -43,7 +44,7 @@ namespace Sunny.UI
public UIProcessBar()
{
SetStyleFlags(true, false);
- MinimumSize = new Size(70, 5);
+ MinimumSize = new Size(70, 3);
Size = new Size(300, 29);
ShowText = false;