Merge commit 'a5e370b84f7fec1617d6ef4142504c8901bf865e'

Author: lindexi

LightTextEditorPlus/Demos/AvaloniaDemo/Business/RichTextCases/RichTextCaseProvider.cs

@@ -523,6 +523,16 @@ void Append(string text, double fontSize)
 
         }, "测试037d9449-加粗的文本里下标渲染错误");
 
+        Add(editor =>
+        {
+            editor.UseWpfLineSpacingStyle();
+            editor.AppendRun(new SkiaTextRun("rr.", editor.StyleRunProperty with
+            {
+                FontSize = 20,
+                FontName = new FontName("微软雅黑"),
+            }));
+        }, "1d0299-使用 rr.导致字符宽度计算错误");
+
         //Add(editor =>
         //{
         //    editor.UseWpfLineSpacingStyle();
@@ -531,6 +541,6 @@ void Append(string text, double fontSize)
         //        FontSize = 24,
         //        FontName = new FontName("HarmonyOS Sans SC")
         //    }));
-        //}, "测试龙芯鸿蒙运行渲染效果");
+        //}, "测试龙芯鸿蒙字体运行渲染效果");
     }
 }

LightTextEditorPlus/Demos/AvaloniaDemo/Views/TextEditorDebugView.axaml.cs

@@ -2,12 +2,15 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
+
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
+
 using LightTextEditorPlus.Demo.Business.RichTextCases;
 using LightTextEditorPlus.Core.Utils;
 using LightTextEditorPlus.FontManagers;
@@ -44,6 +47,31 @@ public TextEditorDebugView(bool runDebug)
             // 调试代码
             RichTextCaseProvider.Debug();
         }
+
+        TextEditorGrid.PointerWheelChanged += TextEditorGrid_OnPointerWheelChanged;
+
+        void TextEditorGrid_OnPointerWheelChanged(object? sender, PointerWheelEventArgs e)
+        {
+            if ((e.KeyModifiers & KeyModifiers.Control) == 0)
+            {
+                return;
+            }
+
+            if (TextEditorGrid.RenderTransform is not ScaleTransform scaleTransform)
+            {
+                scaleTransform = new ScaleTransform();
+                TextEditorGrid.RenderTransform = scaleTransform;
+                TextEditorGrid.RenderTransformOrigin = new RelativePoint(0, 0, RelativeUnit.Relative);
+            }
+
+            var delta = e.Delta.Y / 10;
+
+            scaleTransform.ScaleX += delta;
+            scaleTransform.ScaleY += delta;
+
+            scaleTransform.ScaleX = Math.Max(0.1, scaleTransform.ScaleX);
+            scaleTransform.ScaleY = Math.Max(0.1, scaleTransform.ScaleY);
+        }
     }
 
     [MemberNotNull(nameof(TextEditor), nameof(_textEditor))]

LightTextEditorPlus/Docs/待办.md

@@ -192,6 +192,8 @@
         - 经过测试，发现只有 PPT 下才能处理，在 Word 等，都是走 WPF 行距算法，提升行高从而解决问题
         - [Javanese Text - Typography - Microsoft Learn](https://learn.microsoft.com/zh-hk/typography/font-list/javanese-text )
   - [ ] 带上下标文本的选择范围错误
+  - [ ] Skia 渲染和 HarfBuzzSharp 计算的宽度不相同
+    - 问题号：1d0299-使用 rr.导致字符宽度计算错误
   - [x] Avalonia 设置文本前景色导致连写字渲染失效
     - 问题号： ad1b1c9-设置文本前景色导致连写字渲染失效
     - 修复版本： 0e6e2caa4153d50add3ff6bf24588301bd7222ac

LightTextEditorPlus/Docs/问题列表/1d0299-使用 rr.导致字符宽度计算错误/字符宽度计算错误.png

@@ -0,0 +1,7 @@
+测试版本： 1d0299848c7774da9f891ac04335c5faa311c640
+
+问题描述：
+
+如下图，可见字符宽度不正确，第一个 r 字符的宽度明显大于第二个 r 字符宽度
+
+![](./字符宽度计算错误.png)

LightTextEditorPlus/Docs/问题列表/1d0299-使用 rr.导致字符宽度计算错误/问题描述.md

@@ -510,7 +510,7 @@ public sealed override void Render(DrawingContext context)
     /// <param name="context"></param>
     protected virtual void Render(in AvaloniaTextEditorDrawingContext context)
     {
-        _renderEngine.Render(context);
+        _renderEngine.Render(in context);
     }
 
     #endregion