修复字体缩放时风格消失问题

hlz2516 · Nov 25, 2023 · da1f4fb · da1f4fb
1 parent 126c873
commit da1f4fb
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 29 deletions.
diff --git a/AutoScaleHelper/AutoScale.cs b/AutoScaleHelper/AutoScale.cs
@@ -308,7 +308,7 @@ public void UpdateControlsLayout(bool recursive = true)
                         int fontHeight = (int)(ctrlInfo.Font.Height * 1.0f / ctrlInfo.Rect.Height * curCtrl.Height);
                         FontInfo fontInfo = FontInfos.GetFontInfo(ctrlInfo.Font.Name);
                         float fontSize = fontInfo.GetFloorFontSizeByHeight(fontHeight, ctrlInfo.FontSizeType);
-                        curCtrl.Font = new Font(ctrlInfo.Font.Name, fontSize);
+                        curCtrl.Font = new Font(ctrlInfo.Font.Name, fontSize,ctrlInfo.Font.Style);
                     }
                 }
 
@@ -323,7 +323,8 @@ public void UpdateControlsLayout(bool recursive = true)
             {
                 foreach (var item in g.Value)
                 {
-                    item.Font = g.Key.Font.Clone() as Font;
+                    //item.Font = g.Key.Font.Clone() as Font;
+                    item.Font = new Font(g.Key.Font.FontFamily, g.Key.Font.Size, item.Font.Style);
                 }
             }
 

diff --git a/AutoScaleHelper/TextScale.cs b/AutoScaleHelper/TextScale.cs
@@ -114,15 +114,15 @@ public void ScaleSingle(Control ctrl,ScaleMode scaleMode = ScaleMode.MaintainSel
                     int fontHeight = (int)(ctrlInfo.Font.Height * 1.0f / ctrlInfo.Rect.Height * ctrl.Height);
                     FontInfo fontInfo = FontInfos.GetFontInfo(ctrlInfo.Font.Name);
                     float fontSize = fontInfo.GetFloorFontSizeByHeight(fontHeight, ctrlInfo.FontSizeType);
-                    ctrl.Font = new Font(ctrlInfo.Font.Name, fontSize);
+                    ctrl.Font = new Font(ctrlInfo.Font.Name, fontSize,ctrl.Font.Style);
                 }
                 else if (scaleMode == ScaleMode.MaintainSelfRatioH)
                 {
                     //将设计器中的控件宽度缩放比例作为字体的行高缩放比例
                     float rate = ctrl.Width * 1.0f / ctrlInfo.Rect.Width;
                     FontInfo fontInfo = FontInfos.GetFontInfo(ctrlInfo.Font.Name);
                     float fontSize = fontInfo.GetFloorFontSizeByHeight((int)(rate * ctrlInfo.Font.Height), ctrlInfo.FontSizeType);
-                    ctrl.Font = new Font(ctrlInfo.Font.Name, fontSize);
+                    ctrl.Font = new Font(ctrlInfo.Font.Name, fontSize,ctrl.Font.Style);
                 }
 
                 //针对设置了字体依赖的控件特殊处理
@@ -131,7 +131,8 @@ public void ScaleSingle(Control ctrl,ScaleMode scaleMode = ScaleMode.MaintainSel
                     var values = groups[ctrl];
                     foreach (var item in values)
                     {
-                        item.Font = ctrl.Font.Clone() as Font;
+                        //item.Font = ctrl.Font.Clone() as Font;
+                        item.Font = new Font(ctrl.Font.FontFamily, ctrl.Font.Size, item.Font.Style);
                     }
                 }
             }

diff --git a/Demo/6_字体自适应/FontScaleForm1.Designer.cs b/Demo/6_字体自适应/FontScaleForm1.Designer.cs
diff --git a/Demo/6_字体自适应/FontScaleForm2.Designer.cs b/Demo/6_字体自适应/FontScaleForm2.Designer.cs
diff --git a/Demo/7_常用控件测试/Form_Textbox.Designer.cs b/Demo/7_常用控件测试/Form_Textbox.Designer.cs