bug

HZH
Commit d466e814 由 HZH 编写于 2019-09-12 14:14:47 +0800
HZH_Controls/HZH_Controls/Controls/Process/UCProcessEllipse.cs
HZH_Controls/HZH_Controls/Controls/Roll/UCRollText.cs
HZH_Controls/HZH_Controls/IconFont/FontImages.cs
HZH_Controls/Test/Form1.cs
HZH_Controls/Test/Form1.resx
HZH_Controls/Test/Form2.Designer.cs
--- a/HZH_Controls/HZH_Controls/Controls/Process/UCProcessEllipse.cs
查看文件 @d466e81
+++ b/HZH_Controls/HZH_Controls/Controls/Process/UCProcessEllipse.cs
查看文件 @d466e81
@@ -224,7 +224,7 @@ namespace HZH_Controls.Controls
        /// <summary>
        /// The m font
        /// </summary>
-        private Font m_font = new Font("Arial Unicode MS", 20);
        /// <summary>
        /// 获取或设置控件显示的文字的字体。
        /// </summary>
@@ -240,11 +240,11 @@ namespace HZH_Controls.Controls
        {
            get
            {
-                return m_font;
+                return base.Font;
            }
            set
            {
-                m_font = value;
+                base.Font = value;
                Refresh();
            }
        }
@@ -302,6 +302,7 @@ namespace HZH_Controls.Controls
            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
            this.SetStyle(ControlStyles.UserPaint, true);
            ForeColor = Color.White;
+            Font = new Font("Arial Unicode MS", 20); 
        }
        /// <summary>

--- a/HZH_Controls/HZH_Controls/Controls/Roll/UCRollText.cs
查看文件 @d466e81
+++ b/HZH_Controls/HZH_Controls/Controls/Roll/UCRollText.cs
查看文件 @d466e81
@@ -83,6 +83,10 @@ namespace HZH_Controls.Controls
        /// Gets or sets the text.
        /// </summary>
        /// <value>The text.</value>
+        [Bindable(true)]
+        [Browsable(true)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        [EditorBrowsable(EditorBrowsableState.Always)]
        public override string Text
        {
            get

--- a/HZH_Controls/HZH_Controls/IconFont/FontImages.cs
查看文件 @d466e81
+++ b/HZH_Controls/HZH_Controls/IconFont/FontImages.cs
查看文件 @d466e81
@@ -264,9 +264,10 @@ namespace HZH_Controls
                    graphics.Clear(backColor.Value);
                string s = char.ConvertFromUtf32((int)iconText);
                graphics.TextRenderingHint = TextRenderingHint.AntiAlias;
+                graphics.SetGDIHigh();
                using (Brush brush2 = new SolidBrush(foreColor.Value))
                {
-                    graphics.DrawString(s, imageFont, brush2, new PointF((imageSize - textSize.Width) / 2.0f, (imageSize - textSize.Height) / 2.0f));
+                    graphics.DrawString(s, imageFont, brush2, new PointF((imageSize - textSize.Width) / 2.0f + 1, (imageSize - textSize.Height) / 2.0f + 1));
                }
            }

--- a/HZH_Controls/Test/Form1.cs
查看文件 @d466e81
+++ b/HZH_Controls/Test/Form1.cs
查看文件 @d466e81
@@ -22,6 +22,8 @@ namespace Test
        private void Form1_Load(object sender, EventArgs e)
        {
+          var bit=  HZH_Controls.FontImages.GetImage(FontIcons.A_fa_adn, 32, Color.FromArgb(255, 77, 59));
+          bit.Save("d:\\3.jpg");
            for (int i = 0; i < 3; i++)
            {
                TreeNode tn = new TreeNode("  父节点" + i);

--- a/HZH_Controls/Test/Form1.resx
查看文件 @d466e81
+++ b/HZH_Controls/Test/Form1.resx
查看文件 @d466e81
@@ -178,33 +178,33 @@
  <data name="ucBtnImg1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIrSURBVGhD7VjLbcMwDM0AWaAL9JBbrPTeCQIUtZFLNugG
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIqSURBVGhD7VjLUcMwEM2dBmiAGa62w5kKcmCwh0M6oIO0
-        WSErdIYu0S06jF09mXJjVZYtUnJaQA94yEcyKVJPFJNNQUFBwYD2pXroXtVz21QXw7r61Hynz29dUyma
+        kBaogSbogmZs9skrExtZtnYlhwG9mTeESNb+nlZydhkZGRl/C+1Tcds9V49tU54M6/KD+Mb/v3ZNWfLU
-        +reAxZnFNuqra1QXIuYgKARKj98PfWbnFz3FtlYf7enpkcytB0gBGfctKpZmR3QiyHR+tM3+LMn6FCEr
+        3wU4Z5xtqs+uqTofMQdBIVB+/HroM7vs9BzbunpvXx7ueLntACkg4y6nQmkqQongpdOjbYqjJutzhKzY
-        cpEPWLzPeSpiV8lVeuDQ+ZymZpad6JrdliMbrtRQ1ch1Gpiy53EUojmcusKwn9V3CrmXgSsdW1nYu5dK
+        RDrAeZfxWERV2VR8YNO5jMZmkkp09f2NRDZSqaGrsek4MG3PYchHszmpw4ifpTOFzesglY7tLOLqxZKS
-        SqwMOoexrQ9H37wQk+1CbPasdPpn0T7stuY9S0rCs8Apm1Y6Rv8IhqTAkZK7k9GIzdqtQ7wfxqjviZUS
+        KIOTzdjW+4Nrno/RqhCaPSud/lm6PlAFzGeRlJR7QdI2rXSM/hEMS0EipWklgxGatUuD+DyM8b0nVEoI
-        AjbGuBgtYoaOdC6jsXFgkVISdLAxW+5K59d4ra4Yj5aSpGtd6mhSOi6tlCLOlk0MC0sCwJxBOlrjCCDA
+        2CwmxciJBU6kcxqNjQMLlJLiBhtS8ql0fozX1RnjwVLS3FrXGpqVzpRWSgF7yyZGhDUBYM4gHdI4AvBw
-        obajlfbZc7lCADwHqPHL7O/P9Eg8kDWfUUuMm3nQ/TjTM+zPgw5e3xN+2z+UHOLANo+lw/hxM5TWsA/M
+        6O24SrvWm3KDAGQG0OPXrV8c+ZFwIGuuRS0xbuZB9+NML7DfDxQ8vWa61/6mZhN7yjyWjuDlZmitfhuY
-        YSOUISsdvPrG54igzfMBKckDmDDef4eflfrQTjhfQh2EvhNgR139473URAhtcU4iMUmaOW47LSUSR0uQ
+        I4YvQ1Y6+OsaXyKCNs97pKQPYGbx/ju8VtKmnTG+hhQEnQlYpzq7x3upqeArcUoiMVEuc9LrtJZIHLug
-        Y+1dSJZ9i6U1OxW5d0sQuf+RsLTVKQu4JXMpsy7eInQ3SLjK4i2k9d8l7gMyvR5MX68dCy8y3RcdjmTy
+        x9ZViJZ9i7U9OxalZ4sXqX+RsLTdKQmkLXMtkzpv4TsbNNzEeQtt/58S5wEvvR3MvZ4MKw8yuhftD7zk
-        PjAVKiIQUyKxcEmXmQumLdAHHfdGn90b4nu96KT1vaCgoKCg4H9js/kGhvlYiuzp+UMAAAAASUVORK5C
+        dWA6VEAgpkXCcc0tMxXMtYA2Os6NPrsXxPfkdNT+npGRkZHxj7HbfQH0Olesh9QubgAAAABJRU5ErkJg
-        YII=
+        gg==
 </value>
  </data>
  <data name="ucBtnImg1.ImageFontIcons" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIrSURBVGhD7VjLbcMwDM0AWaAL9JBbrPTeCQIUtZFLNugG
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIqSURBVGhD7VjLUcMwEM2dBmiAGa62w5kKcmCwh0M6oIO0
-        WSErdIYu0S06jF09mXJjVZYtUnJaQA94yEcyKVJPFJNNQUFBwYD2pXroXtVz21QXw7r61Hynz29dUyma
+        kBaogSbogmZs9skrExtZtnYlhwG9mTeESNb+nlZydhkZGRl/C+1Tcds9V49tU54M6/KD+Mb/v3ZNWfLU
-        +reAxZnFNuqra1QXIuYgKARKj98PfWbnFz3FtlYf7enpkcytB0gBGfctKpZmR3QiyHR+tM3+LMn6FCEr
+        3wU4Z5xtqs+uqTofMQdBIVB+/HroM7vs9BzbunpvXx7ueLntACkg4y6nQmkqQongpdOjbYqjJutzhKzY
-        cpEPWLzPeSpiV8lVeuDQ+ZymZpad6JrdliMbrtRQ1ch1Gpiy53EUojmcusKwn9V3CrmXgSsdW1nYu5dK
+        RDrAeZfxWERV2VR8YNO5jMZmkkp09f2NRDZSqaGrsek4MG3PYchHszmpw4ifpTOFzesglY7tLOLqxZKS
-        SqwMOoexrQ9H37wQk+1CbPasdPpn0T7stuY9S0rCs8Apm1Y6Rv8IhqTAkZK7k9GIzdqtQ7wfxqjviZUS
+        KIOTzdjW+4Nrno/RqhCaPSud/lm6PlAFzGeRlJR7QdI2rXSM/hEMS0EipWklgxGatUuD+DyM8b0nVEoI
-        AjbGuBgtYoaOdC6jsXFgkVISdLAxW+5K59d4ra4Yj5aSpGtd6mhSOi6tlCLOlk0MC0sCwJxBOlrjCCDA
+        2CwmxciJBU6kcxqNjQMLlJLiBhtS8ql0fozX1RnjwVLS3FrXGpqVzpRWSgF7yyZGhDUBYM4gHdI4AvBw
-        obajlfbZc7lCADwHqPHL7O/P9Eg8kDWfUUuMm3nQ/TjTM+zPgw5e3xN+2z+UHOLANo+lw/hxM5TWsA/M
+        6O24SrvWm3KDAGQG0OPXrV8c+ZFwIGuuRS0xbuZB9+NML7DfDxQ8vWa61/6mZhN7yjyWjuDlZmitfhuY
-        YSOUISsdvPrG54igzfMBKckDmDDef4eflfrQTjhfQh2EvhNgR139473URAhtcU4iMUmaOW47LSUSR0uQ
+        I4YvQ1Y6+OsaXyKCNs97pKQPYGbx/ju8VtKmnTG+hhQEnQlYpzq7x3upqeArcUoiMVEuc9LrtJZIHLug
-        Y+1dSJZ9i6U1OxW5d0sQuf+RsLTVKQu4JXMpsy7eInQ3SLjK4i2k9d8l7gMyvR5MX68dCy8y3RcdjmTy
+        x9ZViJZ9i7U9OxalZ4sXqX+RsLTdKQmkLXMtkzpv4TsbNNzEeQtt/58S5wEvvR3MvZ4MKw8yuhftD7zk
-        PjAVKiIQUyKxcEmXmQumLdAHHfdGn90b4nu96KT1vaCgoKCg4H9js/kGhvlYiuzp+UMAAAAASUVORK5C
+        dWA6VEAgpkXCcc0tMxXMtYA2Os6NPrsXxPfkdNT+npGRkZHxj7HbfQH0Olesh9QubgAAAABJRU5ErkJg
-        YII=
+        gg==
 </value>
  </data>
  <data name="ucBtnFillet1.BtnImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

--- a/HZH_Controls/Test/Form2.Designer.cs
查看文件 @d466e81
+++ b/HZH_Controls/Test/Form2.Designer.cs
查看文件 @d466e81
@@ -199,6 +199,7 @@
            this.ucRollText1.RollStyle = HZH_Controls.Controls.RollStyle.BackAndForth;
            this.ucRollText1.Size = new System.Drawing.Size(555, 30);
            this.ucRollText1.TabIndex = 23;
+            this.ucRollText1.Text = "滚动文字1";
            // 
            // ucWaveChart1
            // 
@@ -225,6 +226,7 @@
            // 
            this.ucProcessEllipse1.BackEllipseColor = System.Drawing.Color.FromArgb(((int)(((byte)(228)))), ((int)(((byte)(231)))), ((int)(((byte)(237)))));
            this.ucProcessEllipse1.CoreEllipseColor = System.Drawing.Color.FromArgb(((int)(((byte)(228)))), ((int)(((byte)(231)))), ((int)(((byte)(237)))));
+            this.ucProcessEllipse1.Font = new System.Drawing.Font("Arial Unicode MS", 23F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.ucProcessEllipse1.ForeColor = System.Drawing.Color.Black;
            this.ucProcessEllipse1.IsShowCoreEllipseBorder = true;
            this.ucProcessEllipse1.Location = new System.Drawing.Point(30, 173);
@@ -233,7 +235,7 @@
            this.ucProcessEllipse1.ShowType = HZH_Controls.Controls.ShowType.Ring;
            this.ucProcessEllipse1.Size = new System.Drawing.Size(150, 150);
            this.ucProcessEllipse1.TabIndex = 21;
-            this.ucProcessEllipse1.Value = 0;
+            this.ucProcessEllipse1.Value = 10;
            this.ucProcessEllipse1.ValueColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(77)))), ((int)(((byte)(59)))));
            this.ucProcessEllipse1.ValueMargin = 5;
            this.ucProcessEllipse1.ValueType = HZH_Controls.Controls.ValueType.Percent;
@@ -243,6 +245,7 @@
            // 
            this.ucProcessEllipse2.BackEllipseColor = System.Drawing.Color.FromArgb(((int)(((byte)(228)))), ((int)(((byte)(231)))), ((int)(((byte)(237)))));
            this.ucProcessEllipse2.CoreEllipseColor = System.Drawing.Color.FromArgb(((int)(((byte)(228)))), ((int)(((byte)(231)))), ((int)(((byte)(237)))));
+            this.ucProcessEllipse2.Font = new System.Drawing.Font("Arial Unicode MS", 20F);
            this.ucProcessEllipse2.ForeColor = System.Drawing.Color.White;
            this.ucProcessEllipse2.IsShowCoreEllipseBorder = true;
            this.ucProcessEllipse2.Location = new System.Drawing.Point(224, 173);