Changeset 429

Timestamp:

Apr 26, 2019, 5:06:54 AM (6 years ago)

Author:

ataylor

Message:

Fixed unintialized variable causing rare glitch in cursor positioning on click.
Text wrap width calculation now takes both left and right margins into account.

File:

• trunk/Components/RichTextLayoutUnit.pas (modified) (3 diffs)

trunk/Components/RichTextLayoutUnit.pas

@@ -389 +389 @@
 
   WrapX := FLayoutWidth
+           - Style.LeftMargin                   // ALT
+             * FontWidthPrecisionFactor
            - FRichTextSettings.Margins.Right
              * FontWidthPrecisionFactor;
@@ -1230 +1232 @@
                                               ): LongInt;                   // returns new offset within line
 var
-  P:         PChar;             // pointer to current character in string
-  NextP:     PChar;             // pointer to the following character, if any
-  Element:   TTextElement;      // element data about the current character
-  CurrentPos:  LongInt;           // index of first character of line
-  Line:      LongInt;           // current line number
-  Offset:    LongInt;           // offset position within current line
-  InsideDBC: boolean;
-begin
-  if ( Offset > 0 ) and
-     ( Codepage in [ 932, 936, 942, 943, 949, 950, 1381, 1386 ]) then
+  P:          PChar;            // pointer to current character in string
+  NextP:      PChar;            // pointer to the following character, if any
+  Element:    TTextElement;     // element data about the current character
+  CurrentPos: LongInt;          // index of first character of line
+  Line:       LongInt;          // current line number
+  Offset:     LongInt;          // offset position within current line
+  InsideDBC:  boolean;
+begin
+  Offset := 0;
+
+  if ( Codepage in [ 932, 936, 942, 943, 949, 950, 1381, 1386 ]) then
   begin
     // Because parsing of byte types is state based, we must verify every
@@ -1247 +1250 @@
     CurrentPos := GetCharIndex( FLines[ Line ].Text );
     P := TextPointer + CurrentPos;
-    Offset := 0;
     InsideDBC := false;