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

* UIRoundProcess：增加显示小数位数

Browse Source
This commit is contained in:
Sunny 2021-10-18 16:00:11 +08:00
parent 5ece1cc39a
commit 46eccd7b74
6 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

BIN
Bin/net40/SunnyUI.dll
View File

Binary file not shown.

3
SunnyUI.Demo/Controls/FProcess.designer.cs generated
View File

@ -175,6 +175,7 @@ namespace Sunny.UI.Demo
// uiRoundProcess2
//
this.uiRoundProcess2.BackColor = System.Drawing.Color.Transparent;
this.uiRoundProcess2.DecimalPlaces = 0;
this.uiRoundProcess2.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiRoundProcess2.ForeColor = System.Drawing.Color.White;
this.uiRoundProcess2.Inner = 0;
@ -186,7 +187,7 @@ namespace Sunny.UI.Demo
this.uiRoundProcess2.Style = Sunny.UI.UIStyle.Custom;
this.uiRoundProcess2.StyleCustomMode = true;
this.uiRoundProcess2.TabIndex = 93;
this.uiRoundProcess2.Text = "0.0%";
this.uiRoundProcess2.Text = "0%";
//
// uiLine9
//

13
SunnyUI/Controls/UIProcessBar.cs
View File

@ -135,7 +135,7 @@ namespace Sunny.UI
processSize = posValue * Height * 1.0f / Maximum;
if (ShowPercent)
processText = (posValue * 100.0 / maximum).ToString("F" + DecimalCount) + "%";
processText = (posValue * 100.0 / maximum).ToString("F" + decimalCount) + "%";
else
processText = posValue.ToString();
@ -204,10 +204,19 @@ namespace Sunny.UI
}
}
[Description("显示文字小数位数"), Category("SunnyUI")]
[DefaultValue(1)]
public int DecimalPlaces
{
get => decimalCount;
set => decimalCount = Math.Max(value, 0);
}
private int decimalCount = 1;
[Description("显示文字小数位数"), Category("SunnyUI")]
[DefaultValue(1)]
[DefaultValue(1), Browsable(false)]
[Obsolete("请用DecimalPlaces代替。")]
public int DecimalCount
{
get => decimalCount;

17
SunnyUI/Controls/UIRoundProcess.cs
View File

@ -17,6 +17,7 @@
* 创建日期: 2021-04-08
*
* 2021-04-08: V3.0.2 增加文件说明
* 2021-10-18: V3.0.8 增加显示小数位数
******************************************************************************/
using System;
@ -48,6 +49,20 @@ namespace Sunny.UI
ShowRect = false;
}
[Description("显示文字小数位数"), Category("SunnyUI")]
[DefaultValue(1)]
public int DecimalPlaces
{
get => decimalCount;
set
{
decimalCount = Math.Max(value, 0);
Text = (posValue * 100.0 / maximum).ToString("F" + decimalCount) + "%";
}
}
private int decimalCount = 1;
private int maximum = 100;
[DefaultValue(100)]
@ -138,7 +153,7 @@ namespace Sunny.UI
{
posValue = Math.Max(value, 0);
posValue = Math.Min(posValue, maximum);
Text = (posValue * 100.0 / maximum).ToString("F1") + "%";
Text = (posValue * 100.0 / maximum).ToString("F" + decimalCount) + "%";
ValueChanged?.Invoke(this, posValue);
Invalidate();
}

17
SunnyUI/Forms/UIStatusForm.cs
View File

@ -19,6 +19,7 @@
* 2020-05-05: V2.2.5 增加文件
******************************************************************************/
using System;
using System.ComponentModel;
namespace Sunny.UI
@ -32,14 +33,14 @@ namespace Sunny.UI
Description = UILocalize.SystemProcessing;
}
public UIStatusForm(int max, string desc, int decimalCount = 1)
public UIStatusForm(int max, string desc, int decimalPlaces = 1)
{
InitializeComponent();
Maximum = max;
Description = desc;
Value = 0;
DecimalCount = decimalCount;
DecimalPlaces = decimalPlaces;
}
[DefaultValue(100)]
@ -99,10 +100,18 @@ namespace Sunny.UI
set => labelDescription.Text = value;
}
public int DecimalPlaces
{
get => processBar.DecimalPlaces;
set => processBar.DecimalPlaces = value;
}
[Obsolete("请用DecimalPlaces代替。")]
public int DecimalCount
{
get => processBar.DecimalCount;
set => processBar.DecimalCount = value;
get => processBar.DecimalPlaces;
set => processBar.DecimalPlaces = value;
}
private delegate void SetTextHandler(string text);