* UINumPadTextBox: 下拉框可选放大倍数为2

SunnyUI/Controls/DropItem/UINumPadItem.cs

@@ -67,198 +67,214 @@ namespace Sunny.UI
             // 
             // uiSymbolButton1
             // 
-            uiSymbolButton1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton1.Font = new Font("宋体", 12F);
-            uiSymbolButton1.Location = new Point(244, 13);
+            uiSymbolButton1.Location = new Point(245, 13);
             uiSymbolButton1.MinimumSize = new Size(1, 1);
             uiSymbolButton1.Name = "uiSymbolButton1";
-            uiSymbolButton1.Size = new Size(62, 65);
+            uiSymbolButton1.Size = new Size(62, 35);
             uiSymbolButton1.Symbol = 362810;
+            uiSymbolButton1.SymbolOffset = new Point(-4, 1);
             uiSymbolButton1.SymbolSize = 32;
             uiSymbolButton1.TabIndex = 0;
             uiSymbolButton1.Tag = "8";
+            uiSymbolButton1.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton1.Click += uiSymbolButton16_Click;
             // 
             // uiSymbolButton2
             // 
-            uiSymbolButton2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton2.Font = new Font("宋体", 12F);
-            uiSymbolButton2.Location = new Point(244, 93);
+            uiSymbolButton2.Location = new Point(245, 58);
             uiSymbolButton2.MinimumSize = new Size(1, 1);
             uiSymbolButton2.Name = "uiSymbolButton2";
-            uiSymbolButton2.Size = new Size(62, 65);
+            uiSymbolButton2.Size = new Size(62, 35);
             uiSymbolButton2.Symbol = 361543;
             uiSymbolButton2.TabIndex = 1;
             uiSymbolButton2.Tag = "107";
+            uiSymbolButton2.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton2.Click += uiSymbolButton16_Click;
             // 
             // uiSymbolButton3
             // 
-            uiSymbolButton3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton3.Font = new Font("宋体", 12F);
-            uiSymbolButton3.Location = new Point(244, 173);
+            uiSymbolButton3.Location = new Point(245, 103);
             uiSymbolButton3.MinimumSize = new Size(1, 1);
             uiSymbolButton3.Name = "uiSymbolButton3";
-            uiSymbolButton3.Size = new Size(62, 65);
+            uiSymbolButton3.Size = new Size(62, 35);
             uiSymbolButton3.Symbol = 361544;
             uiSymbolButton3.TabIndex = 2;
             uiSymbolButton3.Tag = "109";
+            uiSymbolButton3.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton3.Click += uiSymbolButton16_Click;
             // 
             // uiSymbolButton4
             // 
-            uiSymbolButton4.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton4.Font = new Font("宋体", 12F);
-            uiSymbolButton4.Location = new Point(167, 253);
+            uiSymbolButton4.Location = new Point(168, 148);
             uiSymbolButton4.MinimumSize = new Size(1, 1);
             uiSymbolButton4.Name = "uiSymbolButton4";
-            uiSymbolButton4.Size = new Size(139, 65);
+            uiSymbolButton4.Size = new Size(139, 35);
             uiSymbolButton4.Symbol = 0;
             uiSymbolButton4.TabIndex = 3;
             uiSymbolButton4.Tag = "13";
             uiSymbolButton4.Text = "Enter";
+            uiSymbolButton4.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton4.Click += uiSymbolButton4_Click;
             // 
             // uiSymbolButton6
             // 
-            uiSymbolButton6.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton6.Font = new Font("宋体", 12F);
-            uiSymbolButton6.Location = new Point(167, 173);
+            uiSymbolButton6.Location = new Point(168, 103);
             uiSymbolButton6.MinimumSize = new Size(1, 1);
             uiSymbolButton6.Name = "uiSymbolButton6";
-            uiSymbolButton6.Size = new Size(62, 65);
+            uiSymbolButton6.Size = new Size(62, 35);
             uiSymbolButton6.Symbol = 0;
             uiSymbolButton6.TabIndex = 6;
             uiSymbolButton6.Tag = "51";
             uiSymbolButton6.Text = "3";
+            uiSymbolButton6.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton6.Click += uiSymbolButton16_Click;
             // 
             // uiSymbolButton7
             // 
-            uiSymbolButton7.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton7.Font = new Font("宋体", 12F);
-            uiSymbolButton7.Location = new Point(167, 93);
+            uiSymbolButton7.Location = new Point(168, 58);
             uiSymbolButton7.MinimumSize = new Size(1, 1);
             uiSymbolButton7.Name = "uiSymbolButton7";
-            uiSymbolButton7.Size = new Size(62, 65);
+            uiSymbolButton7.Size = new Size(62, 35);
             uiSymbolButton7.Symbol = 0;
             uiSymbolButton7.TabIndex = 5;
             uiSymbolButton7.Tag = "54";
             uiSymbolButton7.Text = "6";
+            uiSymbolButton7.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton7.Click += uiSymbolButton16_Click;
             // 
             // uiSymbolButton8
             // 
-            uiSymbolButton8.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton8.Font = new Font("宋体", 12F);
-            uiSymbolButton8.Location = new Point(167, 13);
+            uiSymbolButton8.Location = new Point(168, 13);
             uiSymbolButton8.MinimumSize = new Size(1, 1);
             uiSymbolButton8.Name = "uiSymbolButton8";
-            uiSymbolButton8.Size = new Size(62, 65);
+            uiSymbolButton8.Size = new Size(62, 35);
             uiSymbolButton8.Symbol = 0;
             uiSymbolButton8.SymbolSize = 32;
             uiSymbolButton8.TabIndex = 4;
             uiSymbolButton8.Tag = "57";
             uiSymbolButton8.Text = "9";
+            uiSymbolButton8.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton8.Click += uiSymbolButton16_Click;
             // 
             // uiSymbolButton9
             // 
-            uiSymbolButton9.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton9.Font = new Font("宋体", 12F);
-            uiSymbolButton9.Location = new Point(90, 253);
+            uiSymbolButton9.Location = new Point(91, 148);
             uiSymbolButton9.MinimumSize = new Size(1, 1);
             uiSymbolButton9.Name = "uiSymbolButton9";
-            uiSymbolButton9.Size = new Size(62, 65);
+            uiSymbolButton9.Size = new Size(62, 35);
             uiSymbolButton9.Symbol = 0;
             uiSymbolButton9.TabIndex = 11;
             uiSymbolButton9.Tag = "110";
             uiSymbolButton9.Text = ".";
+            uiSymbolButton9.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton9.Click += uiSymbolButton16_Click;
             // 
             // uiSymbolButton10
             // 
-            uiSymbolButton10.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton10.Font = new Font("宋体", 12F);
-            uiSymbolButton10.Location = new Point(90, 173);
+            uiSymbolButton10.Location = new Point(91, 103);
             uiSymbolButton10.MinimumSize = new Size(1, 1);
             uiSymbolButton10.Name = "uiSymbolButton10";
-            uiSymbolButton10.Size = new Size(62, 65);
+            uiSymbolButton10.Size = new Size(62, 35);
             uiSymbolButton10.Symbol = 0;
             uiSymbolButton10.TabIndex = 10;
             uiSymbolButton10.Tag = "50";
             uiSymbolButton10.Text = "2";
+            uiSymbolButton10.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton10.Click += uiSymbolButton16_Click;
             // 
             // uiSymbolButton11
             // 
-            uiSymbolButton11.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton11.Font = new Font("宋体", 12F);
-            uiSymbolButton11.Location = new Point(90, 93);
+            uiSymbolButton11.Location = new Point(91, 58);
             uiSymbolButton11.MinimumSize = new Size(1, 1);
             uiSymbolButton11.Name = "uiSymbolButton11";
-            uiSymbolButton11.Size = new Size(62, 65);
+            uiSymbolButton11.Size = new Size(62, 35);
             uiSymbolButton11.Symbol = 0;
             uiSymbolButton11.TabIndex = 9;
             uiSymbolButton11.Tag = "53";
             uiSymbolButton11.Text = "5";
+            uiSymbolButton11.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton11.Click += uiSymbolButton16_Click;
             // 
             // uiSymbolButton12
             // 
-            uiSymbolButton12.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton12.Font = new Font("宋体", 12F);
-            uiSymbolButton12.Location = new Point(90, 13);
+            uiSymbolButton12.Location = new Point(91, 13);
             uiSymbolButton12.MinimumSize = new Size(1, 1);
             uiSymbolButton12.Name = "uiSymbolButton12";
-            uiSymbolButton12.Size = new Size(62, 65);
+            uiSymbolButton12.Size = new Size(62, 35);
             uiSymbolButton12.Symbol = 0;
             uiSymbolButton12.SymbolSize = 32;
             uiSymbolButton12.TabIndex = 8;
             uiSymbolButton12.Tag = "56";
             uiSymbolButton12.Text = "8";
+            uiSymbolButton12.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton12.Click += uiSymbolButton16_Click;
             // 
             // uiSymbolButton13
             // 
-            uiSymbolButton13.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton13.Font = new Font("宋体", 12F);
-            uiSymbolButton13.Location = new Point(13, 253);
+            uiSymbolButton13.Location = new Point(14, 148);
             uiSymbolButton13.MinimumSize = new Size(1, 1);
             uiSymbolButton13.Name = "uiSymbolButton13";
-            uiSymbolButton13.Size = new Size(62, 65);
+            uiSymbolButton13.Size = new Size(62, 35);
             uiSymbolButton13.Symbol = 0;
             uiSymbolButton13.TabIndex = 15;
             uiSymbolButton13.Tag = "48";
             uiSymbolButton13.Text = "0";
+            uiSymbolButton13.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton13.Click += uiSymbolButton16_Click;
             // 
             // uiSymbolButton14
             // 
-            uiSymbolButton14.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton14.Font = new Font("宋体", 12F);
-            uiSymbolButton14.Location = new Point(13, 173);
+            uiSymbolButton14.Location = new Point(14, 103);
             uiSymbolButton14.MinimumSize = new Size(1, 1);
             uiSymbolButton14.Name = "uiSymbolButton14";
-            uiSymbolButton14.Size = new Size(62, 65);
+            uiSymbolButton14.Size = new Size(62, 35);
             uiSymbolButton14.Symbol = 0;
             uiSymbolButton14.TabIndex = 14;
             uiSymbolButton14.Tag = "49";
             uiSymbolButton14.Text = "1";
+            uiSymbolButton14.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton14.Click += uiSymbolButton16_Click;
             // 
             // uiSymbolButton15
             // 
-            uiSymbolButton15.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton15.Font = new Font("宋体", 12F);
-            uiSymbolButton15.Location = new Point(13, 93);
+            uiSymbolButton15.Location = new Point(14, 58);
             uiSymbolButton15.MinimumSize = new Size(1, 1);
             uiSymbolButton15.Name = "uiSymbolButton15";
-            uiSymbolButton15.Size = new Size(62, 65);
+            uiSymbolButton15.Size = new Size(62, 35);
             uiSymbolButton15.Symbol = 0;
             uiSymbolButton15.TabIndex = 13;
             uiSymbolButton15.Tag = "52";
             uiSymbolButton15.Text = "4";
+            uiSymbolButton15.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton15.Click += uiSymbolButton16_Click;
             // 
             // uiSymbolButton16
             // 
-            uiSymbolButton16.Font = new Font("宋体", 18F, FontStyle.Regular, GraphicsUnit.Point);
+            uiSymbolButton16.Font = new Font("宋体", 12F);
-            uiSymbolButton16.Location = new Point(13, 13);
+            uiSymbolButton16.Location = new Point(14, 13);
             uiSymbolButton16.MinimumSize = new Size(1, 1);
             uiSymbolButton16.Name = "uiSymbolButton16";
-            uiSymbolButton16.Size = new Size(62, 65);
+            uiSymbolButton16.Size = new Size(62, 35);
             uiSymbolButton16.Symbol = 0;
             uiSymbolButton16.SymbolSize = 32;
             uiSymbolButton16.TabIndex = 12;
             uiSymbolButton16.Tag = "55";
             uiSymbolButton16.Text = "7";
+            uiSymbolButton16.TipsFont = new Font("宋体", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
             uiSymbolButton16.Click += uiSymbolButton16_Click;
             // 
             // UINumPadItem
@@ -279,7 +295,7 @@ namespace Sunny.UI
             Controls.Add(uiSymbolButton2);
             Controls.Add(uiSymbolButton1);
             Name = "UINumPadItem";
-            Size = new Size(319, 331);
+            Size = new Size(320, 195);
             ResumeLayout(false);
         }
 
@@ -335,7 +351,37 @@ namespace Sunny.UI
             if (DesignMode) return;
             if (!UIDPIScale.NeedSetDPIFont()) return;
 
-            foreach (var label in this.GetControls<UISymbolButton>()) label.SetDPIScale();
+            foreach (var btn in this.GetControls<UISymbolButton>()) btn.SetDPIScale();
+            if (SizeMultiple > 1)
+            {
+                foreach (var btn in this.GetControls<UISymbolButton>())
+                {
+                    if (!SizeMultipled)
+                    {
+                        btn.Top = btn.Top * SizeMultiple;
+                        btn.Height = btn.Height * SizeMultiple;
+                        btn.SymbolSize = (int)(btn.SymbolSize * 1.5f);
+                    }
+
+                    btn.Font = new Font(btn.Font.FontFamily, btn.Font.Size * 1.5f);
+                }
+
+                SizeMultipled = true;
+            }
+        }
+
+        internal bool SizeMultipled = false;
+        private int sizeMultiple = 1;
+        public int SizeMultiple
+        {
+            get => sizeMultiple;
+            set
+            {
+                if (value < 1) value = 1;
+                if (value > 2) value = 2;
+
+                sizeMultiple = value;
+            }
         }
     }
 }

SunnyUI/Controls/DropItem/UINumPadItem.resx

@@ -1,4 +1,64 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

SunnyUI/Controls/UINumPadTextBox.cs

@@ -19,10 +19,12 @@
  * 2023-03-18: V3.3.3 增加文件说明
  * 2023-03-26: V3.3.3 增加默认事件ValueChanged，下键盘Enter事件相应此事件
  * 2023-03-26: V3.3.4 增加了最大值、最小值等属性
+ * 2023-06-11: V3.6.6 下拉框可选放大倍数为2
 ******************************************************************************/
 
 using System;
 using System.ComponentModel;
+using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
@@ -110,7 +112,7 @@ namespace Sunny.UI
             return edit;
         }
 
-        private readonly UINumPadItem numPad = new UINumPadItem();
+        private readonly UINumPadItem item = new UINumPadItem();
 
         private UIDropDown numPadForm;
 
@@ -120,7 +122,7 @@ namespace Sunny.UI
             {
                 if (numPadForm == null)
                 {
-                    numPadForm = new UIDropDown(numPad);
+                    numPadForm = new UIDropDown(item);
 
                     if (numPadForm != null)
                     {
@@ -225,9 +227,9 @@ namespace Sunny.UI
         private void ShowDropDown()
         {
             NumPadForm.AutoClose = false;
-            numPad.NumPadType = NumPadType;
+            item.NumPadType = NumPadType;
-            numPad.SetDPIScale();
+            item.SetDPIScale();
-            numPad.SetStyleColor(UIStyles.ActiveStyleColor);
+            item.SetStyleColor(UIStyles.ActiveStyleColor);
 
             if (numPadType == NumPadType.IDNumber)
             {
@@ -237,12 +239,17 @@ namespace Sunny.UI
 
             if (!NumPadForm.Visible)
             {
-                NumPadForm.Show(this, NumPadForm.Size);
+                Size size = SizeMultiple == 1 ? new Size(320, 195) : new Size(320, 390);
+                NumPadForm.Show(this, size);
             }
 
             edit.Focus();
         }
 
+        [DefaultValue(1)]
+        [Description("弹窗放大倍数，可以1或者2"), Category("SunnyUI")]
+        public int SizeMultiple { get => item.SizeMultiple; set => item.SizeMultiple = value; }
+
         private void InitializeComponent()
         {
             SuspendLayout();
@@ -275,7 +282,7 @@ namespace Sunny.UI
                 components.Dispose();
             }
 
-            numPad?.Dispose();
+            item?.Dispose();
             numPadForm?.Dispose();
             base.Dispose(disposing);
         }