diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll
index 47a72543..b96d134e 100644
Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ
diff --git a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe
index ddaf1c0a..558edc6a 100644
Binary files a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe and b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe differ
diff --git a/SunnyUI.Demo/Bin/SunnyUI.dll b/SunnyUI.Demo/Bin/SunnyUI.dll
index c0be7a82..09e09162 100644
Binary files a/SunnyUI.Demo/Bin/SunnyUI.dll and b/SunnyUI.Demo/Bin/SunnyUI.dll differ
diff --git a/SunnyUI.Demo/FMain.Designer.cs b/SunnyUI.Demo/FMain.Designer.cs
index 841c5e5c..7fc05d4f 100644
--- a/SunnyUI.Demo/FMain.Designer.cs
+++ b/SunnyUI.Demo/FMain.Designer.cs
@@ -51,7 +51,7 @@
this.Aside.ItemHeight = 36;
this.Aside.LineColor = System.Drawing.Color.Black;
this.Aside.Location = new System.Drawing.Point(2, 145);
- this.Aside.MenuStyle = Sunny.UI.UIMenuStyle.Black;
+ this.Aside.MenuStyle = Sunny.UI.UIMenuStyle.Custom;
this.Aside.ScrollBarColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
this.Aside.ScrollBarHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
this.Aside.ScrollBarPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
@@ -118,7 +118,9 @@
//
// uiContextMenuStrip1
//
+ this.uiContextMenuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
this.uiContextMenuStrip1.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.uiContextMenuStrip1.IsScaled = true;
this.uiContextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.关于ToolStripMenuItem,
this.关于ToolStripMenuItem1});
diff --git a/SunnyUI.Demo/Forms/FEditor.cs b/SunnyUI.Demo/Forms/FEditor.cs
index 892e8587..5055c229 100644
--- a/SunnyUI.Demo/Forms/FEditor.cs
+++ b/SunnyUI.Demo/Forms/FEditor.cs
@@ -21,8 +21,7 @@ namespace Sunny.UI.Demo
person.Birthday = new DateTime(2002, 1, 1);
FEdit frm = new FEdit();
- frm.ReSetDPIScale();
- frm.Style = UIStyles.Style;
+ frm.Render();
frm.Person = person;
frm.ShowDialog();
if (frm.IsOK)
@@ -36,8 +35,7 @@ namespace Sunny.UI.Demo
private void btnAdd_Click(object sender, EventArgs e)
{
FEdit frm = new FEdit();
- frm.ReSetDPIScale();
- frm.Style = UIStyles.Style;
+ frm.Render();
frm.ShowDialogWithMask();
if (frm.IsOK)
{
@@ -89,8 +87,7 @@ namespace Sunny.UI.Demo
option.AddComboCheckedListBox("checkedList", "选择", checkedItems, "CCC");
UIEditForm frm = new UIEditForm(option);
- frm.ReSetDPIScale();
- frm.Style = UIStyles.Style;
+ frm.Render();
frm.CheckedData += Frm_CheckedData;
frm.ShowDialog();
diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj
index 63c6b89c..528f48ba 100644
--- a/SunnyUI.Demo/SunnyUI.Demo.csproj
+++ b/SunnyUI.Demo/SunnyUI.Demo.csproj
@@ -38,8 +38,8 @@
app.manifest
-
- ..\packages\SunnyUI.3.1.2.1\lib\net40\SunnyUI.dll
+
+ ..\packages\SunnyUI.3.1.3\lib\net40\SunnyUI.dll
..\packages\SunnyUI.Common.3.1.2\lib\net40\SunnyUI.Common.dll
diff --git a/SunnyUI.Demo/packages.config b/SunnyUI.Demo/packages.config
index 4a8f6dfe..492e6523 100644
--- a/SunnyUI.Demo/packages.config
+++ b/SunnyUI.Demo/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/SunnyUI/Controls/UIGlobal.cs b/SunnyUI/Controls/UIGlobal.cs
index 4ee28d28..672c6806 100644
--- a/SunnyUI/Controls/UIGlobal.cs
+++ b/SunnyUI/Controls/UIGlobal.cs
@@ -29,7 +29,7 @@ namespace Sunny.UI
///
/// 版本
///
- public const string Version = "SunnyUI.Net V3.1.2";
+ public const string Version = "SunnyUI.Net V3.1.3";
public const int EditorMinHeight = 20;
public const int EditorMaxHeight = 60;
diff --git a/SunnyUI/Style/UIStyleManager.cs b/SunnyUI/Style/UIStyleManager.cs
index dc9fd76d..9973f559 100644
--- a/SunnyUI/Style/UIStyleManager.cs
+++ b/SunnyUI/Style/UIStyleManager.cs
@@ -58,6 +58,7 @@ namespace Sunny.UI
///
public UIStyleManager()
{
+ Version = UIGlobal.Version;
}
///
@@ -67,6 +68,7 @@ namespace Sunny.UI
public UIStyleManager(IContainer container) : this()
{
container.Add(this);
+ Version = UIGlobal.Version;
}
[DefaultValue(false), Description("DPI缩放"), Category("SunnyUI")]
@@ -82,5 +84,13 @@ namespace Sunny.UI
get => UIStyles.FontSize;
set => UIStyles.FontSize = value;
}
+
+ ///
+ /// 版本
+ ///
+ public string Version
+ {
+ get;
+ }
}
}
\ No newline at end of file
diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj
index 0877a174..fb8860d2 100644
--- a/SunnyUI/SunnyUI.csproj
+++ b/SunnyUI/SunnyUI.csproj
@@ -1,93 +1,93 @@
-
- net5.0-windows;net472;net40
- 9.0
- {AB1CB247-E20B-4CBE-B269-570ADDD96C53}
- true
- Sunny.UI
- SunnyUI.Net 是基于.Net Framework 4.0+、.Net 5、.Net 6 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。
- CopyRight © SunnyUI.Net 2012-2022
- LICENSE
- 3.1.2.1
- ShenYonghua
- SunnyUI.Net
- SunnyUI
- https://gitee.com/yhuse/SunnyUI
- https://gitee.com/yhuse/SunnyUI
- False
- SunnyUI.png
- False
- D:\MyDocuments\SunnyUI.pfx
- False
- False
-
+
+ net5.0-windows;net472;net40
+ 9.0
+ {AB1CB247-E20B-4CBE-B269-570ADDD96C53}
+ true
+ Sunny.UI
+ SunnyUI.Net 是基于.Net Framework 4.0+、.Net 5、.Net 6 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。
+ CopyRight © SunnyUI.Net 2012-2022
+ GPL-3.0-only
+ 3.1.3
+ ShenYonghua
+ SunnyUI.Net
+ SunnyUI
+ https://gitee.com/yhuse/SunnyUI
+ https://gitee.com/yhuse/SunnyUI
+ False
+ SunnyUI.png
+ False
+ D:\MyDocuments\SunnyUI.pfx
+ False
+ True
+
-
- ..\Bin\
- true
-
-
+
+ ..\Bin\
+ true
+
+
-
- ..\Bin\
- true
-
-
+
+ ..\Bin\
+ true
+
+
-
- false
-
+
+ false
+
-
-
- True
-
-
-
- True
-
-
-
+
+
+ True
+
+
+
+ True
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
- True
- True
- Resources.resx
-
-
+
+
+ True
+ True
+ Resources.resx
+
+
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+