Changeset 420 for trunk/Components/RichTextView.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/RichTextView.PAS (modified) (6 diffs)

trunk/Components/RichTextView.PAS

@@ -472 +472 @@
   // ALT
   Offset := FCursorOffset;
-  MovetoCharacterBoundary( FText, SelectionStart, FCursorOffset, Offset, FLayout.Codepage );
+  MoveToCharacterBoundary( FText, SelectionStart, FCursorOffset, Offset, FLayout.Codepage, false );
 
   FSelectionStart := SelectionStart;
@@ -493 +493 @@
   // ALT
   Offset := FCursorOffset;
-  MovetoCharacterBoundary( FText, SelectionEnd, FCursorOffset, Offset, FLayout.Codepage );
+  MoveToCharacterBoundary( FText, SelectionEnd, FCursorOffset, Offset, FLayout.Codepage, false );
 
   if FSelectionStart = -1 then
@@ -1230 +1230 @@
   Descender: longint;
   MaxDescender: longint;
+  Index: longint;       // ALT
+  RowStart: longint;    // ALT
 begin
   RemoveCursor;
@@ -1252 +1254 @@
     // off top
     exit;
+
+  // ALT - move to nearest character boundary
+  Index := FLayout.GetCharIndex( Line.Text ) + FCursorOffset;
+  RowStart := FLayout.GetCharIndex( Line.Text );
+  MoveToCharacterBoundary( FText, Index, FCursorOffset, RowStart, FLayout.Codepage, false );
 
   FLayout.GetXFromOffset( FCursorOffset, CursorRow, X );
@@ -2035 +2042 @@
 //  InsideDBC: boolean;       // ALT
   RowStart: longint;        // ALT
+  MoveRight: boolean;       // ALT
   Index: longint;
 begin
@@ -2067 +2075 @@
 
   RowStart := FLayout.GetCharIndex( FLayout.FLines[ Row ].Text );
-  MoveToCharacterBoundary( FText, Index, Offset, RowStart, FLayout.Codepage );  // ALT
+
+  // ALT
+  if Offset = ( FCursorOffset + 1 ) then
+    MoveRight := true
+  else
+    MoveRight := false;
+  MoveToCharacterBoundary( FText, Index, Offset, RowStart, FLayout.Codepage, MoveRight );
 
   FCursorOffset := Offset;