V3.1.3

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});

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.Render();
-            frm.Style = UIStyles.Style;
             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.Render();
-            frm.Style = UIStyles.Style;
             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.Render();
-            frm.Style = UIStyles.Style;
             frm.CheckedData += Frm_CheckedData;
             frm.ShowDialog();
 

SunnyUI.Demo/SunnyUI.Demo.csproj

@@ -38,8 +38,8 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SunnyUI, Version=3.1.2.1, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI, Version=3.1.3.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.3.1.2.1\lib\net40\SunnyUI.dll</HintPath>
+      <HintPath>..\packages\SunnyUI.3.1.3\lib\net40\SunnyUI.dll</HintPath>
     </Reference>
     <Reference Include="SunnyUI.Common, Version=3.1.2.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
       <HintPath>..\packages\SunnyUI.Common.3.1.2\lib\net40\SunnyUI.Common.dll</HintPath>

SunnyUI.Demo/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SunnyUI" version="3.1.2.1" targetFramework="net40" />
+  <package id="SunnyUI" version="3.1.3" targetFramework="net40" />
   <package id="SunnyUI.Common" version="3.1.2" targetFramework="net40" />
 </packages>

SunnyUI/Controls/UIGlobal.cs

@@ -29,7 +29,7 @@ namespace Sunny.UI
         /// <summary>
         /// 版本
         /// </summary>
-        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;

SunnyUI/Style/UIStyleManager.cs

@@ -58,6 +58,7 @@ namespace Sunny.UI
         /// </summary>
         public UIStyleManager()
         {
+            Version = UIGlobal.Version;
         }
 
         /// <summary>
@@ -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;
         }
+
+        /// <summary>
+        /// 版本
+        /// </summary>
+        public string Version
+        {
+            get;
+        }
     }
 }

SunnyUI/SunnyUI.csproj

@@ -8,8 +8,8 @@
         <RootNamespace>Sunny.UI</RootNamespace>
         <Description>SunnyUI.Net 是基于.Net Framework 4.0+、.Net 5、.Net 6 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description>
         <Copyright>CopyRight © SunnyUI.Net 2012-2022</Copyright>
-		<PackageLicenseFile>LICENSE</PackageLicenseFile>
+        <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
-		<Version>3.1.2.1</Version>
+        <Version>3.1.3</Version>
         <Authors>ShenYonghua</Authors>
         <Company>SunnyUI.Net</Company>
         <PackageId>SunnyUI</PackageId>
@@ -20,7 +20,7 @@
         <SignAssembly>False</SignAssembly>
         <AssemblyOriginatorKeyFile>D:\MyDocuments\SunnyUI.pfx</AssemblyOriginatorKeyFile>
         <DelaySign>False</DelaySign>
-		<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -71,7 +71,7 @@
     </ItemGroup>
 
     <ItemGroup>
-		<PackageReference Include="SunnyUI.Common" Version="3.1.2" />
+        <PackageReference Include="SunnyUI.Common" Version="3.1.*" />
     </ItemGroup>
 
     <ItemGroup>