V3.3.3

SunnyUI.Demo/Controls/FFlowLayoutPanel.Designer.cs

@@ -34,6 +34,7 @@ namespace Sunny.UI.Demo
             this.uiButton2 = new Sunny.UI.UIButton();
             this.uiButton3 = new Sunny.UI.UIButton();
             this.uiButton4 = new Sunny.UI.UIButton();
+            this.uiFlowLayoutPanel2 = new Sunny.UI.UIFlowLayoutPanel();
             this.SuspendLayout();
             // 
             // uiButton1
@@ -47,7 +48,6 @@ namespace Sunny.UI.Demo
             this.uiButton1.TabIndex = 11;
             this.uiButton1.Text = "增加";
             this.uiButton1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             this.uiButton1.Click += new System.EventHandler(this.uiButton1_Click);
             // 
             // uiFlowLayoutPanel1
@@ -63,7 +63,6 @@ namespace Sunny.UI.Demo
             this.uiFlowLayoutPanel1.TabIndex = 10;
             this.uiFlowLayoutPanel1.Text = "`";
             this.uiFlowLayoutPanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            this.uiFlowLayoutPanel1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiButton2
             // 
@@ -76,7 +75,6 @@ namespace Sunny.UI.Demo
             this.uiButton2.TabIndex = 12;
             this.uiButton2.Text = "清除";
             this.uiButton2.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             this.uiButton2.Click += new System.EventHandler(this.uiButton2_Click);
             // 
             // uiButton3
@@ -91,7 +89,6 @@ namespace Sunny.UI.Demo
             this.uiButton3.TabIndex = 13;
             this.uiButton3.Text = "移除";
             this.uiButton3.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             this.uiButton3.Click += new System.EventHandler(this.uiButton3_Click);
             // 
             // uiButton4
@@ -105,14 +102,29 @@ namespace Sunny.UI.Demo
             this.uiButton4.TabIndex = 14;
             this.uiButton4.Text = "获取";
             this.uiButton4.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton4.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             this.uiButton4.Click += new System.EventHandler(this.uiButton4_Click);
             // 
+            // uiFlowLayoutPanel2
+            // 
+            this.uiFlowLayoutPanel2.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.uiFlowLayoutPanel2.Location = new System.Drawing.Point(408, 55);
+            this.uiFlowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiFlowLayoutPanel2.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiFlowLayoutPanel2.Name = "uiFlowLayoutPanel2";
+            this.uiFlowLayoutPanel2.Padding = new System.Windows.Forms.Padding(2);
+            this.uiFlowLayoutPanel2.ShowText = false;
+            this.uiFlowLayoutPanel2.Size = new System.Drawing.Size(354, 390);
+            this.uiFlowLayoutPanel2.TabIndex = 15;
+            this.uiFlowLayoutPanel2.Text = "`";
+            this.uiFlowLayoutPanel2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.uiFlowLayoutPanel2.WrapContents = false;
+            // 
             // FFlowLayoutPanel
             // 
             this.AllowShowTitle = true;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.ClientSize = new System.Drawing.Size(800, 539);
+            this.Controls.Add(this.uiFlowLayoutPanel2);
             this.Controls.Add(this.uiButton4);
             this.Controls.Add(this.uiButton3);
             this.Controls.Add(this.uiButton2);
@@ -134,5 +146,6 @@ namespace Sunny.UI.Demo
         private UIButton uiButton2;
         private UIButton uiButton3;
         private UIButton uiButton4;
+        private UIFlowLayoutPanel uiFlowLayoutPanel2;
     }
 }

SunnyUI.Demo/Controls/FFlowLayoutPanel.cs

@@ -31,12 +31,21 @@
 
             //建议用封装的方法Add
             uiFlowLayoutPanel1.Add(btn);
+
             //或者Panel.Controls.Add
             //uiFlowLayoutPanel1.Panel.Controls.Add(btn);
 
             //不能用原生方法Controls.Add
             //uiFlowLayoutPanel1.Controls.Add(btn);    
 
+            var box = new UIGroupBox();
+            box.Width = 100;
+            box.Height = uiFlowLayoutPanel2.Height - 32;
+            box.SetDPIScale();
+            box.Text = "Button" + index++.ToString("D2");
+            box.Name = box.Text;
+            uiFlowLayoutPanel2.Add(box);
+
             uiButton3.Enabled = true;
         }
 
@@ -50,6 +59,7 @@
         {
             //清除用Clear方法
             uiFlowLayoutPanel1.Clear();
+            uiFlowLayoutPanel2.Clear();
             //或者用
             //uiFlowLayoutPanel1.Panel.Controls.Clear();
 

SunnyUI.Demo/Controls/FOther.Designer.cs

@@ -55,7 +55,6 @@ namespace Sunny.UI.Demo
             this.uiLabel3.TabIndex = 79;
             this.uiLabel3.Text = "鼠标移过来看提示";
             this.uiLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.uiLabel3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiLabel2
             // 
@@ -67,7 +66,6 @@ namespace Sunny.UI.Demo
             this.uiLabel2.TabIndex = 78;
             this.uiLabel2.Text = "鼠标移过来看提示";
             this.uiLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.uiLabel2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiLabel1
             // 
@@ -80,7 +78,6 @@ namespace Sunny.UI.Demo
             this.uiLabel1.Text = "鼠标移过来看提示";
             this.uiLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.uiToolTip1.SetToolTip(this.uiLabel1, "赠人玫瑰手有余香");
-            this.uiLabel1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiLine7
             // 
@@ -92,7 +89,6 @@ namespace Sunny.UI.Demo
             this.uiLine7.TabIndex = 76;
             this.uiLine7.Text = "UIToolTip";
             this.uiLine7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.uiLine7.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiScrollingText2
             // 
@@ -104,7 +100,6 @@ namespace Sunny.UI.Demo
             this.uiScrollingText2.Size = new System.Drawing.Size(319, 35);
             this.uiScrollingText2.TabIndex = 75;
             this.uiScrollingText2.Text = "赠人玫瑰手有余香";
-            this.uiScrollingText2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiScrollingText1
             // 
@@ -121,7 +116,6 @@ namespace Sunny.UI.Demo
             this.uiScrollingText1.StyleCustomMode = true;
             this.uiScrollingText1.TabIndex = 74;
             this.uiScrollingText1.Text = "赠人玫瑰手有余香";
-            this.uiScrollingText1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiLine6
             // 
@@ -133,7 +127,6 @@ namespace Sunny.UI.Demo
             this.uiLine6.TabIndex = 73;
             this.uiLine6.Text = "UIScrollingText";
             this.uiLine6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.uiLine6.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiToolTip1
             // 
@@ -153,7 +146,6 @@ namespace Sunny.UI.Demo
             this.uiLine1.TabIndex = 80;
             this.uiLine1.Text = "UIVerificationCode";
             this.uiLine1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.uiLine1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiVerificationCode1
             // 
@@ -163,7 +155,6 @@ namespace Sunny.UI.Demo
             this.uiVerificationCode1.Name = "uiVerificationCode1";
             this.uiVerificationCode1.Size = new System.Drawing.Size(100, 35);
             this.uiVerificationCode1.TabIndex = 81;
-            this.uiVerificationCode1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiVerificationCode2
             // 
@@ -174,7 +165,6 @@ namespace Sunny.UI.Demo
             this.uiVerificationCode2.Name = "uiVerificationCode2";
             this.uiVerificationCode2.Size = new System.Drawing.Size(140, 35);
             this.uiVerificationCode2.TabIndex = 82;
-            this.uiVerificationCode2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiCalendar1
             // 
@@ -189,7 +179,6 @@ namespace Sunny.UI.Demo
             this.uiCalendar1.TabIndex = 83;
             this.uiCalendar1.Text = "uiCalendar1";
             this.uiCalendar1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            this.uiCalendar1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             this.uiCalendar1.OnDateTimeChanged += new Sunny.UI.OnDateTimeChanged(this.uiCalendar1_OnDateTimeChanged);
             // 
             // uiLine2
@@ -200,9 +189,8 @@ namespace Sunny.UI.Demo
             this.uiLine2.Name = "uiLine2";
             this.uiLine2.Size = new System.Drawing.Size(319, 20);
             this.uiLine2.TabIndex = 84;
-            this.uiLine2.Text = "UIVerificationCode";
+            this.uiLine2.Text = "UICalendar";
             this.uiLine2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.uiLine2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // FOther
             // 

SunnyUI.Demo/Controls/FOther.resx

@@ -120,7 +120,4 @@
   <metadata name="uiToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="uiToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

SunnyUI.Demo/Properties/AssemblyInfo.cs

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

SunnyUI.Demo/SunnyUI.Demo.csproj

@@ -41,8 +41,8 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SunnyUI, Version=3.3.2.1, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI, Version=3.3.3.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.3.3.2.1\lib\net472\SunnyUI.dll</HintPath>
+      <HintPath>..\packages\SunnyUI.3.3.3\lib\net472\SunnyUI.dll</HintPath>
     </Reference>
     <Reference Include="SunnyUI.Common, Version=3.3.2.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
       <HintPath>..\packages\SunnyUI.Common.3.3.2\lib\net472\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.3.2.1" targetFramework="net472" />
+  <package id="SunnyUI" version="3.3.3" targetFramework="net472" />
   <package id="SunnyUI.Common" version="3.3.2" targetFramework="net472" />
 </packages>

SunnyUI/SunnyUI.csproj

@@ -9,7 +9,7 @@
         <Description>SunnyUI.Net 是基于.Net Framework 4.0~4.8、.Net6、.Net7 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description>
         <Copyright>CopyRight © SunnyUI.Net 2012-2023</Copyright>
         <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
-        <Version>3.3.2.1</Version>
+        <Version>3.3.3.0</Version>
         <Authors>ShenYonghua</Authors>
         <Company>SunnyUI.Net</Company>
         <PackageId>SunnyUI</PackageId>