Merge pull request #816 from 7474/fix-win11-formsize

Windows11下でのフォームサイズ、テキストレンダリングをある程度最適化

Author: 7474

SRC.Sharp/SRCSharpForm/Forms/Configuration.Designer.cs

@@ -7,9 +7,11 @@
 using SRCCore;
 using SRCCore.Commands;
 using SRCCore.Maps;
+using SRCSharpForm.Lib;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Text;
 using System.Linq;
 using System.Windows.Forms;
 
@@ -18,6 +20,45 @@ namespace SRCSharpForm
     // メインウィンドウのフォーム
     internal partial class frmMain : Form
     {
+        /// <summary>
+        /// ContextMenuStrip のテキストを SingleBitPerPixelGridFit でシャープに描画するレンダラー。
+        /// ToolStripSystemRenderer が使う TextRenderer.DrawText (GDI) は
+        /// Graphics.TextRenderingHint の影響を受けないため、DrawString に置き換えて制御する。
+        /// TODO レンダリングの課題を見直す https://github.com/7474/SRC/pull/816#discussion_r2867096631
+        /// </summary>
+        private sealed class SharpMenuRenderer : ToolStripSystemRenderer
+        {
+            protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e)
+            {
+                var oldHint = e.Graphics.TextRenderingHint;
+                try
+                {
+                    e.Graphics.TextRenderingHint = RenderingConfig.TextHint;
+                    using var brush = new SolidBrush(e.TextColor);
+                    using var sf = new StringFormat(StringFormat.GenericDefault)
+                    {
+                        Alignment = StringAlignment.Near,
+                        LineAlignment = StringAlignment.Center,
+                        FormatFlags = StringFormatFlags.NoWrap,
+                        HotkeyPrefix = HotkeyPrefix.None,
+                    };
+                    e.Graphics.DrawString(e.Text, e.TextFont, brush, e.TextRectangle, sf);
+                }
+                finally
+                {
+                    e.Graphics.TextRenderingHint = oldHint;
+                }
+            }
+        }
+
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            // ポップアップメニューにシャープレンダラーを適用
+            var sharpRenderer = new SharpMenuRenderer();
+            mnuUnitCommand.Renderer = sharpRenderer;
+            mnuMapCommand.Renderer = sharpRenderer;
+        }
         public SRCCore.SRC SRC { get; set; }
         public IGUI GUI => SRC.GUI;
         public Map Map => SRC.Map;

SRC.Sharp/SRCSharpForm/Forms/ErrorMessage.Designer.cs

@@ -9,7 +9,6 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Text;
 using System.Linq;
 using System.Text;
 
@@ -43,9 +42,7 @@ internal partial class frmMain : IGUIStatus
         public Color StatusFontColorNormalString = Color.FromArgb(0, 0, 0);
         public Color StatusFontColorWarning = Color.FromArgb(190, 0, 0);
 
-        // XXX
-        private TextRenderingHint StatusTextRenderingHint = TextRenderingHint.SystemDefault;
-        //private Font StatusFont = new Font("Yu Gothic UI", 10f);
+        //private Font StatusFont
         //private Font StatusFont = new Font("Meiryo UI", 10f);
         private Font StatusFont = new Font("ＭＳ 明朝", 10f);
         // XXX 10.5より大きい感じする
@@ -82,7 +79,7 @@ public void DisplayGlobalStatus()
                 picUnitStatus.NewImageIfNull();
                 using (var g = Graphics.FromImage(picUnitStatus.Image))
                 {
-                    g.TextRenderingHint = StatusTextRenderingHint;
+                    g.TextRenderingHint = RenderingConfig.TextHint;
                     g.DrawString(sb.ToString(), StatusFont, StatusNormalStringBrush, 0, 0);
                 }
                 return;
@@ -201,7 +198,7 @@ public void DisplayGlobalStatus()
             picUnitStatus.NewImageIfNull();
             using (var g = Graphics.FromImage(picUnitStatus.Image))
             {
-                g.TextRenderingHint = StatusTextRenderingHint;
+                g.TextRenderingHint = RenderingConfig.TextHint;
                 g.DrawString(sb.ToString(), StatusFont, StatusNormalStringBrush, 0, 0);
 
                 // マップ画像表示
@@ -244,8 +241,8 @@ public void DisplayUnitStatus(Unit u, Pilot p = null)
                 using (var pilotG = Graphics.FromImage(picPilotStatus.NewImageIfNull().Image))
                 using (var unitG = Graphics.FromImage(picUnitStatus.NewImageIfNull().Image))
                 {
-                    pilotG.TextRenderingHint = StatusTextRenderingHint;
-                    unitG.TextRenderingHint = StatusTextRenderingHint;
+                    pilotG.TextRenderingHint = RenderingConfig.TextHint;
+                    unitG.TextRenderingHint = RenderingConfig.TextHint;
                     var headingMargin = HeadingFont.Height;
                     var textMargin = StatusFont.Height;
                     var smallMargin = StatusSmallFont.Height;