* UIMiniPagination: 按钮图标位置修正

* UITextBox: 按钮图标位置修正
更新Demo

SunnyUI.Demo/Controls/FFlowLayoutPanel.cs

@@ -1,4 +1,7 @@
-namespace Sunny.UI.Demo
+using System;
+using System.Windows.Forms;
+
+namespace Sunny.UI.Demo
 {
     public partial class FFlowLayoutPanel : UIPage
     {
@@ -97,6 +100,12 @@
 
             //通过名称和类型获取
             UIButton button = uiFlowLayoutPanel1.Get<UIButton>("Button01");
+
+            //遍历，与原生方法不同，UIFlowLayoutPanel是组合控件，从其Panel控件遍历
+            foreach (Control item in uiFlowLayoutPanel1.Panel.Controls)
+            {
+                Console.WriteLine(item.Name);
+            }
         }
     }
 }

SunnyUI.Demo/Controls/FTextBox.Designer.cs

@@ -62,6 +62,7 @@ namespace Sunny.UI.Demo
             this.uiTextBox6.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiTextBox6.Name = "uiTextBox6";
             this.uiTextBox6.Padding = new System.Windows.Forms.Padding(5);
+            this.uiTextBox6.ShowText = false;
             this.uiTextBox6.Size = new System.Drawing.Size(221, 29);
             this.uiTextBox6.Symbol = 61461;
             this.uiTextBox6.TabIndex = 2;
@@ -79,6 +80,7 @@ namespace Sunny.UI.Demo
             this.uiTextBox5.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiTextBox5.Name = "uiTextBox5";
             this.uiTextBox5.Padding = new System.Windows.Forms.Padding(5);
+            this.uiTextBox5.ShowText = false;
             this.uiTextBox5.Size = new System.Drawing.Size(221, 29);
             this.uiTextBox5.TabIndex = 1;
             this.uiTextBox5.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
@@ -96,6 +98,7 @@ namespace Sunny.UI.Demo
             this.uiTextBox4.Name = "uiTextBox4";
             this.uiTextBox4.Padding = new System.Windows.Forms.Padding(5);
             this.uiTextBox4.ShowScrollBar = true;
+            this.uiTextBox4.ShowText = false;
             this.uiTextBox4.Size = new System.Drawing.Size(308, 226);
             this.uiTextBox4.TabIndex = 5;
             this.uiTextBox4.Text = "Blog: https://www.cnblogs.com/yhuse\r\nGitee: https://gitee.com/yhuse/SunnyUI\r\nGitH" +
@@ -135,6 +138,7 @@ namespace Sunny.UI.Demo
             this.uiRichTextBox1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiRichTextBox1.Name = "uiRichTextBox1";
             this.uiRichTextBox1.Padding = new System.Windows.Forms.Padding(2);
+            this.uiRichTextBox1.ShowText = false;
             this.uiRichTextBox1.Size = new System.Drawing.Size(308, 226);
             this.uiRichTextBox1.TabIndex = 6;
             this.uiRichTextBox1.Text = "Blog: https://www.cnblogs.com/yhuse\nGitee: https://gitee.com/yhuse/SunnyUI\nGitHub" +
@@ -182,6 +186,7 @@ namespace Sunny.UI.Demo
             this.uiDoubleUpDown1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiDoubleUpDown1.MinimumSize = new System.Drawing.Size(100, 0);
             this.uiDoubleUpDown1.Name = "uiDoubleUpDown1";
+            this.uiDoubleUpDown1.ShowText = false;
             this.uiDoubleUpDown1.Size = new System.Drawing.Size(150, 29);
             this.uiDoubleUpDown1.TabIndex = 8;
             this.uiDoubleUpDown1.Text = "uiDoubleUpDown1";
@@ -210,6 +215,7 @@ namespace Sunny.UI.Demo
             this.uiTextBox3.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiTextBox3.Name = "uiTextBox3";
             this.uiTextBox3.Padding = new System.Windows.Forms.Padding(5);
+            this.uiTextBox3.ShowText = false;
             this.uiTextBox3.Size = new System.Drawing.Size(221, 29);
             this.uiTextBox3.TabIndex = 4;
             this.uiTextBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
@@ -232,19 +238,20 @@ namespace Sunny.UI.Demo
             this.uiTextBox2.ButtonWidth = 100;
             this.uiTextBox2.CanEmpty = true;
             this.uiTextBox2.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.uiTextBox2.DoubleValue = 5D;
+            this.uiTextBox2.DoubleValue = 50D;
             this.uiTextBox2.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.uiTextBox2.IntValue = 5;
+            this.uiTextBox2.IntValue = 50;
             this.uiTextBox2.Location = new System.Drawing.Point(117, 206);
             this.uiTextBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.uiTextBox2.Maximum = 9D;
+            this.uiTextBox2.Maximum = 200D;
-            this.uiTextBox2.Minimum = 0D;
+            this.uiTextBox2.Minimum = 50D;
             this.uiTextBox2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiTextBox2.Name = "uiTextBox2";
             this.uiTextBox2.Padding = new System.Windows.Forms.Padding(5);
+            this.uiTextBox2.ShowText = false;
             this.uiTextBox2.Size = new System.Drawing.Size(221, 29);
             this.uiTextBox2.TabIndex = 3;
-            this.uiTextBox2.Text = "5";
+            this.uiTextBox2.Text = "50";
             this.uiTextBox2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.uiTextBox2.Type = Sunny.UI.UITextBox.UIEditType.Integer;
             this.uiTextBox2.Watermark = "水印文字";
@@ -269,6 +276,7 @@ namespace Sunny.UI.Demo
             this.uiIntegerUpDown1.Minimum = -100;
             this.uiIntegerUpDown1.MinimumSize = new System.Drawing.Size(100, 0);
             this.uiIntegerUpDown1.Name = "uiIntegerUpDown1";
+            this.uiIntegerUpDown1.ShowText = false;
             this.uiIntegerUpDown1.Size = new System.Drawing.Size(150, 29);
             this.uiIntegerUpDown1.TabIndex = 7;
             this.uiIntegerUpDown1.Text = "_uiIntegerUpDown1";
@@ -289,7 +297,9 @@ namespace Sunny.UI.Demo
             this.uiTextBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiTextBox1.MinimumSize = new System.Drawing.Size(1, 16);
             this.uiTextBox1.Name = "uiTextBox1";
+            this.uiTextBox1.Padding = new System.Windows.Forms.Padding(5);
             this.uiTextBox1.ShowButton = true;
+            this.uiTextBox1.ShowText = false;
             this.uiTextBox1.Size = new System.Drawing.Size(221, 29);
             this.uiTextBox1.TabIndex = 52;
             this.uiTextBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
@@ -316,6 +326,7 @@ namespace Sunny.UI.Demo
             this.uiipTextBox1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiipTextBox1.Name = "uiipTextBox1";
             this.uiipTextBox1.Padding = new System.Windows.Forms.Padding(1);
+            this.uiipTextBox1.ShowText = false;
             this.uiipTextBox1.Size = new System.Drawing.Size(150, 29);
             this.uiipTextBox1.TabIndex = 55;
             this.uiipTextBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;

SunnyUI.Demo/Properties/AssemblyInfo.cs

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

SunnyUI.Demo/SunnyUI.Demo.csproj

@@ -41,11 +41,11 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SunnyUI, Version=3.3.8.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI, Version=3.3.9.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.3.3.8\lib\net472\SunnyUI.dll</HintPath>
+      <HintPath>..\packages\SunnyUI.3.3.9\lib\net472\SunnyUI.dll</HintPath>
     </Reference>
-    <Reference Include="SunnyUI.Common, Version=3.3.2.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI.Common, Version=3.3.9.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.Common.3.3.2\lib\net472\SunnyUI.Common.dll</HintPath>
+      <HintPath>..\packages\SunnyUI.Common.3.3.9\lib\net472\SunnyUI.Common.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

SunnyUI.Demo/Units/FCommon.Designer.cs

@@ -30,6 +30,7 @@ namespace Sunny.UI.Demo
         private void InitializeComponent()
         {
             this.uiButton1 = new Sunny.UI.UIButton();
+            this.uiMiniPagination1 = new Sunny.UI.UIMiniPagination();
             this.SuspendLayout();
             // 
             // uiButton1
@@ -42,14 +43,31 @@ namespace Sunny.UI.Demo
             this.uiButton1.Size = new System.Drawing.Size(100, 35);
             this.uiButton1.TabIndex = 0;
             this.uiButton1.Text = "Mapper";
+            this.uiButton1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiButton1.Click += new System.EventHandler(this.uiButton1_Click);
             // 
+            // uiMiniPagination1
+            // 
+            this.uiMiniPagination1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiMiniPagination1.Location = new System.Drawing.Point(43, 149);
+            this.uiMiniPagination1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiMiniPagination1.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiMiniPagination1.Name = "uiMiniPagination1";
+            this.uiMiniPagination1.RadiusSides = Sunny.UI.UICornerRadiusSides.None;
+            this.uiMiniPagination1.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
+            this.uiMiniPagination1.ShowText = false;
+            this.uiMiniPagination1.Size = new System.Drawing.Size(433, 40);
+            this.uiMiniPagination1.TabIndex = 1;
+            this.uiMiniPagination1.Text = "uiMiniPagination1";
+            this.uiMiniPagination1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.uiMiniPagination1.TotalCount = 1000;
+            // 
             // FCommon
             // 
             this.AllowShowTitle = true;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.uiMiniPagination1);
             this.Controls.Add(this.uiButton1);
             this.Name = "FCommon";
             this.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
@@ -64,5 +82,6 @@ namespace Sunny.UI.Demo
         #endregion
 
         private UIButton uiButton1;
+        private UIMiniPagination uiMiniPagination1;
     }
 }

SunnyUI.Demo/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SunnyUI" version="3.3.8" targetFramework="net472" />
+  <package id="SunnyUI" version="3.3.9" targetFramework="net472" />
-  <package id="SunnyUI.Common" version="3.3.2" targetFramework="net472" />
+  <package id="SunnyUI.Common" version="3.3.9" targetFramework="net472" />
 </packages>

SunnyUI/Controls/DropItem/UINumPadItem.cs

@@ -1,6 +1,5 @@
 using System.ComponentModel;
 using System.Drawing;
-using System.Windows.Forms;
 
 namespace Sunny.UI
 {
@@ -74,7 +73,6 @@ namespace Sunny.UI
             uiSymbolButton1.Name = "uiSymbolButton1";
             uiSymbolButton1.Size = new Size(62, 65);
             uiSymbolButton1.Symbol = 362810;
-            uiSymbolButton1.SymbolOffset = new Point(-3, 0);
             uiSymbolButton1.SymbolSize = 32;
             uiSymbolButton1.TabIndex = 0;
             uiSymbolButton1.Tag = "8";
@@ -151,7 +149,6 @@ namespace Sunny.UI
             uiSymbolButton8.Name = "uiSymbolButton8";
             uiSymbolButton8.Size = new Size(62, 65);
             uiSymbolButton8.Symbol = 0;
-            uiSymbolButton8.SymbolOffset = new Point(-3, 0);
             uiSymbolButton8.SymbolSize = 32;
             uiSymbolButton8.TabIndex = 4;
             uiSymbolButton8.Tag = "57";
@@ -205,7 +202,6 @@ namespace Sunny.UI
             uiSymbolButton12.Name = "uiSymbolButton12";
             uiSymbolButton12.Size = new Size(62, 65);
             uiSymbolButton12.Symbol = 0;
-            uiSymbolButton12.SymbolOffset = new Point(-3, 0);
             uiSymbolButton12.SymbolSize = 32;
             uiSymbolButton12.TabIndex = 8;
             uiSymbolButton12.Tag = "56";
@@ -259,7 +255,6 @@ namespace Sunny.UI
             uiSymbolButton16.Name = "uiSymbolButton16";
             uiSymbolButton16.Size = new Size(62, 65);
             uiSymbolButton16.Symbol = 0;
-            uiSymbolButton16.SymbolOffset = new Point(-3, 0);
             uiSymbolButton16.SymbolSize = 32;
             uiSymbolButton16.TabIndex = 12;
             uiSymbolButton16.Tag = "55";

SunnyUI/Controls/UIMiniPagination.cs

@@ -17,6 +17,7 @@
  * 创建日期: 2023-02-19
  *
  * 2023-02-19: V3.3.2 新增迷你分页控件，只有分页按钮，无其他
+ * 2023-06-14: V3.3.9 按钮图标位置修正
 ******************************************************************************/
 
 using System;
@@ -356,7 +357,6 @@ namespace Sunny.UI
             this.b0.Radius = 2;
             this.b0.Size = new System.Drawing.Size(32, 32);
             this.b0.Symbol = 61700;
-            this.b0.SymbolOffset = new System.Drawing.Point(3, 0);
             this.b0.TabIndex = 0;
             this.b0.Tag = "-1";
             this.b0.TagString = "<";
@@ -585,7 +585,6 @@ namespace Sunny.UI
             this.b16.Radius = 2;
             this.b16.Size = new System.Drawing.Size(32, 32);
             this.b16.Symbol = 61701;
-            this.b16.SymbolOffset = new System.Drawing.Point(-3, 0);
             this.b16.TabIndex = 16;
             this.b16.Tag = "1";
             this.b16.TagString = ">";

SunnyUI/Controls/UITextBox.cs

@@ -46,6 +46,7 @@
  * 2022-11-26: V3.2.9 增加MouseClick，MouseDoubleClick事件
  * 2023-02-07: V3.3.1 增加Tips小红点
  * 2023-02-10: V3.3.2 有水印时，系统响应触摸屏增加了TouchPressClick属性，默认关闭
+ * 2023-06-14: V3.3.9 按钮图标位置修正
 ******************************************************************************/
 
 using System;
@@ -108,7 +109,6 @@ namespace Sunny.UI
             btn.Visible = false;
             btn.Text = "";
             btn.Symbol = 361761;
-            btn.SymbolOffset = new Point(0, 1);
             btn.Top = 1;
             btn.Height = 25;
             btn.Width = 29;