V3.0.5 更新内容见Updates.md

Bin/net5.0-windows/SunnyUI.deps.json

@@ -6,36 +6,36 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v5.0": {
-      "SunnyUI/3.0.4": {
+      "SunnyUI/3.0.5": {
         "dependencies": {
-          "SunnyUI.Common": "3.0.4"
+          "SunnyUI.Common": "3.0.5"
         },
         "runtime": {
           "SunnyUI.dll": {}
         }
       },
-      "SunnyUI.Common/3.0.4": {
+      "SunnyUI.Common/3.0.5": {
         "runtime": {
           "lib/net5.0/SunnyUI.Common.dll": {
-            "assemblyVersion": "3.0.4.0",
+            "assemblyVersion": "3.0.5.0",
-            "fileVersion": "3.0.4.0"
+            "fileVersion": "3.0.5.0"
           }
         }
       }
     }
   },
   "libraries": {
-    "SunnyUI/3.0.4": {
+    "SunnyUI/3.0.5": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "SunnyUI.Common/3.0.4": {
+    "SunnyUI.Common/3.0.5": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-eFd9v+FBd6+pkdjFIOx2SWXmifFmYh9RL8wgrtt3A4Q81uCo7NNiYYJys/YIcpxQReObOWmJ1h/3vZCD3sfnlA==",
+      "sha512": "sha512-bP9fQW8P4fJAV6FfU2Xfw3MtOduLoj/j+MRfdIn3eq9bGqDepg/w5/xqXi393Vuxvxk24eY9+5YMRVyeS+tiRg==",
-      "path": "sunnyui.common/3.0.4",
+      "path": "sunnyui.common/3.0.5",
-      "hashPath": "sunnyui.common.3.0.4.nupkg.sha512"
+      "hashPath": "sunnyui.common.3.0.5.nupkg.sha512"
     }
   }
 }

Bin/netcoreapp3.1/SunnyUI.deps.json

@@ -6,36 +6,36 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v3.1": {
-      "SunnyUI/3.0.4": {
+      "SunnyUI/3.0.5": {
         "dependencies": {
-          "SunnyUI.Common": "3.0.4"
+          "SunnyUI.Common": "3.0.5"
         },
         "runtime": {
           "SunnyUI.dll": {}
         }
       },
-      "SunnyUI.Common/3.0.4": {
+      "SunnyUI.Common/3.0.5": {
         "runtime": {
           "lib/netcoreapp3.1/SunnyUI.Common.dll": {
-            "assemblyVersion": "3.0.4.0",
+            "assemblyVersion": "3.0.5.0",
-            "fileVersion": "3.0.4.0"
+            "fileVersion": "3.0.5.0"
           }
         }
       }
     }
   },
   "libraries": {
-    "SunnyUI/3.0.4": {
+    "SunnyUI/3.0.5": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "SunnyUI.Common/3.0.4": {
+    "SunnyUI.Common/3.0.5": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-eFd9v+FBd6+pkdjFIOx2SWXmifFmYh9RL8wgrtt3A4Q81uCo7NNiYYJys/YIcpxQReObOWmJ1h/3vZCD3sfnlA==",
+      "sha512": "sha512-bP9fQW8P4fJAV6FfU2Xfw3MtOduLoj/j+MRfdIn3eq9bGqDepg/w5/xqXi393Vuxvxk24eY9+5YMRVyeS+tiRg==",
-      "path": "sunnyui.common/3.0.4",
+      "path": "sunnyui.common/3.0.5",
-      "hashPath": "sunnyui.common.3.0.4.nupkg.sha512"
+      "hashPath": "sunnyui.common.3.0.5.nupkg.sha512"
     }
   }
 }

SunnyUI.Demo/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.4.0")]
+[assembly: AssemblyVersion("3.0.5.0")]
-[assembly: AssemblyFileVersion("3.0.4.0")]
+[assembly: AssemblyFileVersion("3.0.5.0")]

SunnyUI.Demo/SunnyUI.Demo.csproj

@@ -35,11 +35,11 @@
     <ApplicationIcon>SunnyUI.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SunnyUI, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI, Version=3.0.5.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Bin\net40\SunnyUI.dll</HintPath>
     </Reference>
-    <Reference Include="SunnyUI.Common, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI.Common, Version=3.0.5.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Bin\net40\SunnyUI.Common.dll</HintPath>
     </Reference>

SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj

@@ -6,9 +6,9 @@
     <UseWindowsForms>true</UseWindowsForms>
     <RootNamespace>Sunny.UI.Demo</RootNamespace>
     <ApplicationIcon>SunnyUI.ico</ApplicationIcon>
-    <AssemblyVersion>3.0.4.0</AssemblyVersion>
+    <AssemblyVersion>3.0.5.0</AssemblyVersion>
-    <FileVersion>3.0.4.0</FileVersion>
+    <FileVersion>3.0.5.0</FileVersion>
-    <Version>3.0.4</Version>
+    <Version>3.0.5</Version>
     <Authors>SunnyUI</Authors>
     <Company>SunnyUI.Net</Company>
     <Copyright>Copyright ©SunnyUI.Net 2012-2021</Copyright>
@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SunnyUI" Version="3.0.4" />
+    <PackageReference Include="SunnyUI" Version="3.0.5" />
   </ItemGroup>
 
   <ItemGroup>

SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json

@@ -6,54 +6,54 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v5.0": {
-      "SunnyUI.Net5.Demo/3.0.4": {
+      "SunnyUI.Net5.Demo/3.0.5": {
         "dependencies": {
-          "SunnyUI": "3.0.4"
+          "SunnyUI": "3.0.5"
         },
         "runtime": {
           "SunnyUI.Net5.Demo.dll": {}
         }
       },
-      "SunnyUI/3.0.4": {
+      "SunnyUI/3.0.5": {
         "dependencies": {
-          "SunnyUI.Common": "3.0.4"
+          "SunnyUI.Common": "3.0.5"
         },
         "runtime": {
           "lib/net5.0-windows7.0/SunnyUI.dll": {
-            "assemblyVersion": "3.0.4.0",
+            "assemblyVersion": "3.0.5.0",
-            "fileVersion": "3.0.4.0"
+            "fileVersion": "3.0.5.0"
           }
         }
       },
-      "SunnyUI.Common/3.0.4": {
+      "SunnyUI.Common/3.0.5": {
         "runtime": {
           "lib/net5.0/SunnyUI.Common.dll": {
-            "assemblyVersion": "3.0.4.0",
+            "assemblyVersion": "3.0.5.0",
-            "fileVersion": "3.0.4.0"
+            "fileVersion": "3.0.5.0"
           }
         }
       }
     }
   },
   "libraries": {
-    "SunnyUI.Net5.Demo/3.0.4": {
+    "SunnyUI.Net5.Demo/3.0.5": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "SunnyUI/3.0.4": {
+    "SunnyUI/3.0.5": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-bFGJ/r5BjMW86l6zjPd1P5lSXu5b3oOqxQ7dOxoZ4+Vgy6yM4QPRLcft1JDHRujx0DiUCztPu/Y+iaZoift9LQ==",
+      "sha512": "sha512-0+U39GWGWBQFmoZom+UOzuST9FxsbUol5RWZgnBLzfGDlR+O4C72HjQ38u9G/SppWBswr5+dmGvFYHBA2HS4uQ==",
-      "path": "sunnyui/3.0.4",
+      "path": "sunnyui/3.0.5",
-      "hashPath": "sunnyui.3.0.4.nupkg.sha512"
+      "hashPath": "sunnyui.3.0.5.nupkg.sha512"
     },
-    "SunnyUI.Common/3.0.4": {
+    "SunnyUI.Common/3.0.5": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-eFd9v+FBd6+pkdjFIOx2SWXmifFmYh9RL8wgrtt3A4Q81uCo7NNiYYJys/YIcpxQReObOWmJ1h/3vZCD3sfnlA==",
+      "sha512": "sha512-bP9fQW8P4fJAV6FfU2Xfw3MtOduLoj/j+MRfdIn3eq9bGqDepg/w5/xqXi393Vuxvxk24eY9+5YMRVyeS+tiRg==",
-      "path": "sunnyui.common/3.0.4",
+      "path": "sunnyui.common/3.0.5",
-      "hashPath": "sunnyui.common.3.0.4.nupkg.sha512"
+      "hashPath": "sunnyui.common.3.0.5.nupkg.sha512"
     }
   }
 }

SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json

@@ -1,8 +1,9 @@
 {
   "runtimeOptions": {
     "additionalProbingPaths": [
-      "C:\\Users\\Administrator\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\Sunny\\.dotnet\\store\\|arch|\\|tfm|",
-      "C:\\Users\\Administrator\\.nuget\\packages"
+      "C:\\Users\\Sunny\\.nuget\\packages",
+      "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
     ]
   }
 }

SunnyUI/Controls/UINavMenu.cs

@@ -45,7 +45,6 @@ namespace Sunny.UI
             SetStyle(ControlStyles.DoubleBuffer |
                      ControlStyles.AllPaintingInWmPaint |
                      ControlStyles.OptimizedDoubleBuffer, true);
-
             UpdateStyles();
 
             BorderStyle = BorderStyle.None;
@@ -159,34 +158,35 @@ namespace Sunny.UI
                 }
             }
         }
-        /// <summary>
-        /// SizeChange导致treeNode闪屏
-        /// </summary>
-        const int TVM_SETEXTENDEDSTYLE = 0x112C;
-        const int TVS_EX_DOUBLEBUFFER = 0x0004;
 
-        private void UpdateExtendedStyles()
+        // /// <summary>
-        {
+        // /// SizeChange导致treeNode闪屏
-            int style = 0;
+        // /// </summary>
+        // const int TVM_SETEXTENDEDSTYLE = 0x112C;
+        // const int TVS_EX_DOUBLEBUFFER = 0x0004;
+        //
+        // private void UpdateExtendedStyles()
+        // {
+        //     int style = 0;
+        //
+        //     if (DoubleBuffered)
+        //         style |= TVS_EX_DOUBLEBUFFER;
+        //
+        //     if (Style != 0)
+        //         Win32.User.SendMessage(Handle, TVM_SETEXTENDEDSTYLE, new IntPtr(TVS_EX_DOUBLEBUFFER), new IntPtr(style));
+        // }
+        //
+        // protected override void OnHandleCreated(EventArgs e)
+        // {
+        //     base.OnHandleCreated(e);
+        //     UpdateExtendedStyles();
+        // }
 
-            if (DoubleBuffered)
+        //protected override void OnSizeChanged(EventArgs e)
-                style |= TVS_EX_DOUBLEBUFFER;
+        //{
-
+        //    base.OnSizeChanged(e);
-            if (Style != 0)
+        //    SetScrollInfo();
-                Win32.User.SendMessage(Handle, TVM_SETEXTENDEDSTYLE, new IntPtr(TVS_EX_DOUBLEBUFFER), new IntPtr(style));
+        //}
-        }
-
-        protected override void OnHandleCreated(EventArgs e)
-        {
-            base.OnHandleCreated(e);
-            UpdateExtendedStyles();
-        }
-
-        protected override void OnSizeChanged(EventArgs e)
-        {
-            base.OnSizeChanged(e);
-            SetScrollInfo();
-        }
 
         private void Bar_ValueChanged(object sender, EventArgs e)
         {
@@ -827,8 +827,14 @@ namespace Sunny.UI
 
         protected override void WndProc(ref Message m)
         {
-            base.WndProc(ref m);
             if (IsDisposed || Disposing) return;
+            if (m.Msg == Win32.User.WM_ERASEBKGND)
+            {
+                m.Result = IntPtr.Zero;
+                return;
+            }
+
+            base.WndProc(ref m);
             Win32.User.ShowScrollBar(Handle, 3, false);
         }
 

SunnyUI/Properties/Resources.Designer.cs

@@ -200,7 +200,7 @@ namespace Sunny.UI.Properties {
         }
         
         /// <summary>
-        ///   查找类似 V3.0.4 的本地化字符串。
+        ///   查找类似 V3.0.5 的本地化字符串。
         /// </summary>
         internal static string Version {
             get {

SunnyUI/Properties/Resources.resx

@@ -162,8 +162,8 @@
     <value>..\Resources\notifier.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>V3.0.4</value>
+    <value>V3.0.5</value>
-    <comment>2021-05-20</comment>
+    <comment>2021-07-11</comment>
   </data>
   <data name="wind" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\wind.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

SunnyUI/SunnyUI.csproj

@@ -8,7 +8,7 @@
 	<Description>SunnyUI.Net 是基于.Net Framework 4.0+、.Net Core3.1、.Net 5 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description>
 	<Copyright>CopyRight © SunnyUI.Net 2012-2021</Copyright>
 	<PackageLicenseFile>LICENSE</PackageLicenseFile>
-	<Version>3.0.4</Version>
+	<Version>3.0.5</Version>
 	<Authors>ShenYonghua</Authors>
 	<Company>SunnyUI.Net</Company>
 	<PackageId>SunnyUI</PackageId>
@@ -61,7 +61,7 @@
 </ItemGroup>
  
 <ItemGroup>
-	<PackageReference Include="SunnyUI.Common" Version="3.0.4" />
+	<PackageReference Include="SunnyUI.Common" Version="3.0.5" />
 </ItemGroup>
 
 <ItemGroup Condition="'$(TargetFramework)' == 'net40'">

Updates.md

@@ -1,5 +1,38 @@
 :fa-plus:增加；  :fa-asterisk:修改；  :fa-minus:删除
 
+#### 2021-07-11 V3.0.5  
+:fa-plus:  字体图标：增加FontAwesome V5.15版本字体图标  
+:fa-plus:  UISignal: 增加信号强度显示控件  
+:fa-plus:  UIToolStripDropDown: 增加了一个弹窗管理类  
+:fa-asterisk: UIPage：增加标题行，后期以替代UITitlePage  
+:fa-asterisk: Demo的Controls下的页面全部从UITitlePage切换到UIPage，后期会逐步舍弃UITitlePage。  
+:fa-asterisk: UIDataGridView：增加了一个RowHeight，默认23  
+:fa-asterisk: IStyleInterface：设置为Public，可基于此扩展外部控件  
+:fa-asterisk: UIRichTextBox：支持可改背景色  
+:fa-asterisk: UIPagination：更新了Demo，分页切换事件加载数据。  
+:fa-asterisk: UITitlePage：解决标题栏闪烁  
+:fa-asterisk: UITextBox：增加图标和字体图标的显示  
+:fa-asterisk: UITextBox: MaximumEnabled，MinimumEnabled代替HasMaximum，HasMinim  
+:fa-asterisk: UIHeaderButton: 增加了TextImageRelation，实现文本和图像的相对位置  
+:fa-asterisk: UIListBox：修改对象绑定的显示问题  
+:fa-asterisk: UICombobox: 更新了数据绑定相关代码  
+:fa-asterisk: UITabControl：Tab页标题选中高亮颜色增加可调整高度  
+:fa-asterisk: UINavBar: 标题选中高亮颜色增加可调整高度  
+:fa-asterisk: UIListBox：更新一处数据绑定显示错误  
+:fa-asterisk: UINavMenu：增加右侧图标  
+:fa-asterisk: UIBattery：修改可自定义背景色  
+:fa-asterisk: UILight：增加方形显示，优化渐变色  
+:fa-asterisk: UIHeaderButton：增加ShowSelected，是否显示选中状态  
+:fa-asterisk: UIBarChart：修正一个显示的Bug  
+:fa-asterisk: UIRoundProcess：修改显示值  
+:fa-asterisk: UIRichTextBox：增加WordWrap属性  
+:fa-asterisk: UIDataGridView：自定义单元格颜色  
+:fa-asterisk: IFame：增加一个反馈的接口，Feedback，Page可将对象反馈给Frame  
+:fa-asterisk: UIAvatar：更改图片显示  
+:fa-asterisk: UIPagination：设置总数在页面不超过总页数的情况下不刷新  
+:fa-asterisk: UITextBox等组合控件将其回调事件的Sender设置为this，而不是其内置控件  
+:fa-asterisk: UIFlowLayoutPanel：增加滚动条颜色属性  
+
 #### 2021-05-20 V3.0.4  
 :fa-plus: UIObjectCollection：带集合个数改变事件的对象集合类  
 :fa-plus: UIStringCollection：带集合个数改变事件的字符串集合类