Changeset 420 for trunk/Components/RichTextLayoutUnit.pas

Timestamp:

Feb 28, 2019, 4:17:24 AM (6 years ago)

Author:

ataylor

Message:

Improve DBCS string width calculations, other small tweaks.

File:

• trunk/Components/RichTextLayoutUnit.pas (modified) (1 diff)

trunk/Components/RichTextLayoutUnit.pas

@@ -834 +834 @@
   begin
     Element := ExtractNextTextElement( P, NextP );
-    CheckSpecialElementType( Element.Character, Element.ElementType, InsideDBC, Codepage );   // ALT
+
+    // ALT - handle double-byte characters
+    if InsideDBC and ( P < EndP ) then
+    begin
+      P := NextP;
+      Element := ExtractNextTextElement( P, NextP );
+      InsideDBC := false;
+    end;
+    CheckSpecialElementType( Element.Character, Element.ElementType, InsideDBC, Codepage );
+    // ALT done
 
     case Element.ElementType of