* UIMessageForm2: 重构文字显示位置，重绘

SunnyUI/Forms/UIMessageForm2.Designer.cs

@@ -31,7 +31,6 @@
             components = new System.ComponentModel.Container();
             btnCancel = new UISymbolButton();
             btnOK = new UISymbolButton();
-            label1 = new System.Windows.Forms.Label();
             timer1 = new System.Windows.Forms.Timer(components);
             SuspendLayout();
             // 
@@ -42,7 +41,7 @@
             btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
             btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             btnCancel.Font = new System.Drawing.Font("宋体", 12F);
-            btnCancel.Location = new System.Drawing.Point(378, 124);
+            btnCancel.Location = new System.Drawing.Point(378, 164);
             btnCancel.Margin = new System.Windows.Forms.Padding(0);
             btnCancel.MinimumSize = new System.Drawing.Size(1, 1);
             btnCancel.Name = "btnCancel";
@@ -62,7 +61,7 @@
             btnOK.Cursor = System.Windows.Forms.Cursors.Hand;
             btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
             btnOK.Font = new System.Drawing.Font("宋体", 12F);
-            btnOK.Location = new System.Drawing.Point(263, 124);
+            btnOK.Location = new System.Drawing.Point(263, 164);
             btnOK.Margin = new System.Windows.Forms.Padding(0);
             btnOK.MinimumSize = new System.Drawing.Size(1, 1);
             btnOK.Name = "btnOK";
@@ -74,16 +73,6 @@
             btnOK.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134);
             btnOK.TipsText = null;
             // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new System.Drawing.Point(119, 67);
-            label1.MaximumSize = new System.Drawing.Size(360, 0);
-            label1.Name = "label1";
-            label1.Size = new System.Drawing.Size(359, 32);
-            label1.TabIndex = 12;
-            label1.Text = "提示消息提示消息提示消息提示消息提示消息提示消息提示消息";
-            // 
             // timer1
             // 
             timer1.Interval = 1000;
@@ -92,12 +81,10 @@
             // UIMessageForm2
             // 
             AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-            ClientSize = new System.Drawing.Size(500, 180);
+            ClientSize = new System.Drawing.Size(516, 220);
-            Controls.Add(label1);
             Controls.Add(btnCancel);
             Controls.Add(btnOK);
             EscClose = true;
-            FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             MaximizeBox = false;
             MinimizeBox = false;
             Name = "UIMessageForm2";
@@ -105,17 +92,16 @@
             ShowInTaskbar = false;
             StartPosition = System.Windows.Forms.FormStartPosition.Manual;
             Text = "UIMessageForm2";
+            ZoomScaleRect = new System.Drawing.Rectangle(15, 15, 500, 180);
             FormClosed += UIMessageForm2_FormClosed;
             Shown += UIMessageForm2_Shown;
             Paint += UIMessageForm2_Paint;
             ResumeLayout(false);
-            PerformLayout();
         }
 
         #endregion
         protected UISymbolButton btnCancel;
         protected UISymbolButton btnOK;
-        private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Timer timer1;
     }
 }

SunnyUI/Forms/UIMessageForm2.cs

@@ -18,9 +18,11 @@
  *
  * 2024-05-16: V3.6.6 增加文件说明
  * 2024-06-08: V3.6.6 统一配色
+ * 2024-08-10: V3.6.8 重构文字显示位置，重绘
 ******************************************************************************/
 
 using System.Drawing;
+using System.Windows.Forms;
 
 namespace Sunny.UI
 {
@@ -30,13 +32,12 @@ namespace Sunny.UI
         {
             InitializeComponent();
             Text = title;
-            label1.Text = message;
+            Message = message;
             btnOK.Text = UILocalize.OK;
             btnCancel.Text = UILocalize.Cancel;
 
             foreColor = Color.Black;
 
-
             if (noteType != UINotifierType.Ask)
             {
                 btnOK.Left = btnCancel.Left;
@@ -100,10 +101,36 @@ namespace Sunny.UI
                 foreColor = Color.White;
             }
 
-            int height = (190 - 48 + TitleHeight) + label1.Height;
+            SizeF sf = e.Graphics.MeasureString(Message, font: Font, 360);
-            if (height > 210) Height = height;
+            if (sf.Height > 60)
+            {
+                int height = (int)sf.Height - 60;
+                Height = 220 + height;
+
+                if (Owner != null)
+                {
+                    int t = Owner.Top;
+                    int h = Owner.Height;
+                    if (Owner is UIPage)
+                    {
+                        Form form = Owner.ParentForm;
+                        t = form.Top;
+                        h = form.Height;
+                    }
+
+                    Top = t + (h - Height) / 2;
+                }
+            }
+
+            float top = Height - TitleHeight - 76;
+            top = top / 2.0f - sf.Height / 2.0f;
+            PointF pt = new PointF(120, top + TitleHeight);
+
+            using SolidBrush br = new SolidBrush(ForeColor);
+            e.Graphics.DrawString(Message, Font, br, new RectangleF(pt.X, pt.Y, sf.Width, sf.Height));
+
             e.Graphics.FillRectangle(Color, new RectangleF(0, Height - 76, Width, 76));
-            e.Graphics.DrawFontImage(Symbol, 72, SymbolColor, new RectangleF(28, 64, 64, 64));
+            e.Graphics.DrawFontImage(Symbol, 72, SymbolColor, new RectangleF(28, 62, 64, 64));
         }
 
         private void timer1_Tick(object sender, System.EventArgs e)