Changeset 418 for trunk/Components/RichTextView.PAS

Timestamp:

Feb 25, 2019, 8:34:42 PM (6 years ago)

Author:

ataylor

Message:

Experimental new logic to try and fix DBCS text wrapping.

File:

• trunk/Components/RichTextView.PAS (modified) (6 diffs)

trunk/Components/RichTextView.PAS

@@ -459 +459 @@
 
 Procedure TRichTextView.SetSelectionStartInternal( SelectionStart: longint );
+var
+  Offset: longint;     // ALT
 begin
   if SelectionStart = FSelectionStart then
@@ -468 +470 @@
       ClearSelection;
 
+  // ALT
+  Offset := FCursorOffset;
+  MovetoCharacterBoundary( FText, SelectionStart, FCursorOffset, Offset, FLayout.Codepage );
+
   FSelectionStart := SelectionStart;
   if FSelectionEnd = -1 then
@@ -479 +485 @@
   StartRedrawLine: longint;
   EndRedrawLine: longint;
+  Offset: longint;         // ALT
   OldClip: TRect;
 begin
   if SelectionEnd = FSelectionEnd then
     exit;
+
+  // ALT
+  Offset := FCursorOffset;
+  MovetoCharacterBoundary( FText, SelectionEnd, FCursorOffset, Offset, FLayout.Codepage );
 
   if FSelectionStart = -1 then
@@ -797 +808 @@
     // we haven't yet done a layout
     Layout;
+
 
 end;
@@ -2018 +2030 @@
                                            PreserveSelection: boolean );
 var
+//  P: PChar;                 // ALT
+//  NextP: PChar;             // ALT
+//  Element: TTextElement;    // ALT
+//  InsideDBC: boolean;       // ALT
+  RowStart: longint;        // ALT
   Index: longint;
 begin
   RemoveCursor;
+
+  Index := FLayout.GetCharIndex( FLayout.FLines[ Row ].Text ) + Offset;
+
+// ALT
+{
+  if ( Offset > 0 ) and
+     ( FLayout.Codepage in [ 932, 936, 942, 943, 949, 950, 1381, 1386 ]) then
+  begin
+    RowStart := FLayout.GetCharIndex( FLayout.FLines[ Row ].Text );
+    P := FText + RowStart;
+    InsideDBC := false;
+    while RowStart < Index do
+    begin
+      Element := ExtractNextTextElement( P, NextP );
+      CheckSpecialElementType( Element.Character, Element.ElementType, InsideDBC, FLayout.Codepage );
+      P := NextP;
+      inc( RowStart );
+    end;
+    Element := ExtractNextTextElement( P, NextP );
+    CheckSpecialElementType( Element.Character, Element.ElementType, InsideDBC, FLayout.Codepage );
+    if InsideDBC then
+    begin
+      dec( Index );
+      dec( Offset );
+    end;
+  end;
+}
+
+  RowStart := FLayout.GetCharIndex( FLayout.FLines[ Row ].Text );
+  MoveToCharacterBoundary( FText, Index, Offset, RowStart, FLayout.Codepage );  // ALT
+
   FCursorOffset := Offset;
   FCursorRow := Row;
-  Index := FLayout.GetCharIndex( FLayout.FLines[ Row ].Text ) + Offset;
+
   if PreserveSelection then
   begin
@@ -2047 +2095 @@
 
   Element := ExtractNextTextElement( P, NextP );
+
   P := NextP;
   while Element.ElementType = teStyle do