mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-29 13:10:53 +02:00
* Use VDelete instead of Delete to support BIDI text
git-svn-id: trunk@6089 -
This commit is contained in:
parent
9a64dd88d7
commit
bcb9c47ed9
@ -4583,7 +4583,11 @@ var
|
|||||||
l := BB.X;
|
l := BB.X;
|
||||||
r := BE.X;
|
r := BE.X;
|
||||||
MBCSGetSelRangeInLineWhenColumnSelectionMode(TempString, l, r);
|
MBCSGetSelRangeInLineWhenColumnSelectionMode(TempString, l, r);
|
||||||
|
{$IFDEF USE_UTF8BIDI_LCL}
|
||||||
|
VDelete(TempString, l, r - 1);
|
||||||
|
{$ELSE USE_UTF8BIDI_LCL}
|
||||||
Delete(TempString, l, r - l);
|
Delete(TempString, l, r - l);
|
||||||
|
{$ENDIF USE_UTF8BIDI_LCL}
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
TrimmedSetLine(x, TempString);
|
TrimmedSetLine(x, TempString);
|
||||||
end;
|
end;
|
||||||
@ -7005,7 +7009,11 @@ begin
|
|||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
CaretX := CaretX - counter;
|
CaretX := CaretX - counter;
|
||||||
Helper := Copy(Temp, CaretX, counter);
|
Helper := Copy(Temp, CaretX, counter);
|
||||||
|
{$IFDEF USE_UTF8BIDI_LCL}
|
||||||
|
VDelete(Temp, CaretX, counter, drLTR);
|
||||||
|
{$ELSE USE_UTF8BIDI_LCL}
|
||||||
Delete(Temp, CaretX, counter);
|
Delete(Temp, CaretX, counter);
|
||||||
|
{$ENDIF USE_UTF8BIDI_LCL}
|
||||||
TrimmedSetLine(CaretY - 1, Temp);
|
TrimmedSetLine(CaretY - 1, Temp);
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
@ -7040,7 +7048,11 @@ begin
|
|||||||
Helper := Copy(Temp, LogCaretXY.X, Counter);
|
Helper := Copy(Temp, LogCaretXY.X, Counter);
|
||||||
Caret.X := LogicalToPhysicalCol(Temp,LogCaretXY.X+Counter);
|
Caret.X := LogicalToPhysicalCol(Temp,LogCaretXY.X+Counter);
|
||||||
Caret.Y := CaretY;
|
Caret.Y := CaretY;
|
||||||
|
{$IFDEF USE_UTF8BIDI_LCL}
|
||||||
|
VDelete(Temp, LogCaretXY.X, Counter, drLTR);
|
||||||
|
{$ELSE USE_UTF8BIDI_LCL}
|
||||||
System.Delete(Temp, LogCaretXY.X, Counter);
|
System.Delete(Temp, LogCaretXY.X, Counter);
|
||||||
|
{$ENDIF USE_UTF8BIDI_LCL}
|
||||||
TrimmedSetLine(CaretY - 1, Temp);
|
TrimmedSetLine(CaretY - 1, Temp);
|
||||||
{$ELSE}
|
{$ELSE}
|
||||||
counter := 1;
|
counter := 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user