paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-14 19:39:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: Markup and more paint-token-breaker for future bidi support

Browse Source 
git-svn-id: trunk@39005 -
This commit is contained in:
martin 2012-10-08 22:09:20 +00:00
parent 4613e69b46
commit 20e8599307
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
components/synedit/syneditmarkupspecialchar.pp
View File

@ -112,9 +112,9 @@ begin
Result := nil;
if (FCurLine='') or (not (FHasMarkup and (FVisibleSpecialChars <> []))) then exit;
if (aStartCol.Physical >= FCurStart) and (aStartCol.Physical < FCurEnd) then begin
if (aStartCol.Logical >= FCurStart) and (aStartCol.Logical < FCurEnd) then begin
Result := MarkupInfo;
MarkupInfo.SetFrameBoundsPhys(FCurStart, FCurEnd);
MarkupInfo.SetFrameBoundsLog(FCurStart, FCurEnd);
end;
end;
@ -129,21 +129,22 @@ begin
ANextPhys := -1;
if (FCurLine='') or (not (FHasMarkup and (FVisibleSpecialChars <> []))) then exit;
if aStartCol.Physical < FCurStart then begin
ANextPhys := FCurStart;
if aStartCol.Logical < FCurStart then begin
ANextLog := FCurStart;
exit;
end;
if aStartCol.Physical < FCurEnd then begin
ANextPhys := FCurEnd;
if aStartCol.Logical < FCurEnd then begin
ANextLog := FCurEnd;
exit;
end;
LogCol := PhysicalToLogicalPos(Point(aStartCol.Physical, aRow)).x;
LogCol := aStartCol.Logical;
if LogCol > Length(FCurLine) then exit;
if (LogCol = Length(FCurLine)) then begin
if IsSpecial(LogCol) then
ANextPhys := LogicalToPhysicalPos(Point(Length(FCurLine)+1, aRow)).x;
FCurEnd := ANextPhys;
if IsSpecial(LogCol) then begin
ANextLog := Length(FCurLine)+1;
FCurEnd := ANextLog;
end;
exit;
end;
@ -151,21 +152,21 @@ begin
i := LogCol;
s := IsSpecial(LogCol);
if s then
FCurStart := aStartCol.Physical
FCurStart := aStartCol.Logical
else begin
while (i <= Length(FCurLine)) and (not IsSpecial(i)) do inc(i);
FCurStart := LogicalToPhysicalPos(Point(i, aRow)).x;
FCurStart := i;
end;
while (i <= Length(FCurLine)) and (IsSpecial(i)) do inc(i);
FCurEnd := LogicalToPhysicalPos(Point(i, aRow)).x;
FCurEnd := i;
if aStartCol.Physical < FCurStart then begin
ANextPhys := FCurStart;
if aStartCol.Logical < FCurStart then begin
ANextLog := FCurStart;
exit;
end;
if aStartCol.Physical < FCurEnd then begin
ANextPhys := FCurEnd;
if aStartCol.Logical < FCurEnd then begin
ANextLog := FCurEnd;
exit;
end;
end;