SynEdit: refactor

git-svn-id: trunk@34241 -
This commit is contained in:
martin 2011-12-17 11:18:04 +00:00
parent b08de46fb5
commit ae11c87ef7

View File

@ -3649,8 +3649,8 @@ var
else else
Attr := nil; Attr := nil;
repeat repeat
MarkupInfo := fMarkupManager.GetMarkupAttributeAtRowCol(FFoldedLinesView.TextIndex[CurLine]+1, NextPos); MarkupInfo := fMarkupManager.GetMarkupAttributeAtRowCol(CurTextIndex+1, NextPos);
NextPos := fMarkupManager.GetNextMarkupColAfterRowCol(FFoldedLinesView.TextIndex[CurLine]+1, NextPos); NextPos := fMarkupManager.GetNextMarkupColAfterRowCol(CurTextIndex+1, NextPos);
if Assigned(Attr) then if Assigned(Attr) then
begin begin
@ -3906,7 +3906,7 @@ var
// Calculate Token Sublen for current Markup // Calculate Token Sublen for current Markup
NextPhysPos := fMarkupManager.GetNextMarkupColAfterRowCol NextPhysPos := fMarkupManager.GetNextMarkupColAfterRowCol
(FFoldedLinesView.TextIndex[CurLine]+1, PhysicalStartPos); (CurTextIndex+1, PhysicalStartPos);
if NextPhysPos < 1 if NextPhysPos < 1
then SubCharLen := TokenCharLen then SubCharLen := TokenCharLen
else SubCharLen := NextPhysPos - PhysicalStartPos; else SubCharLen := NextPhysPos - PhysicalStartPos;
@ -3924,7 +3924,7 @@ var
FPaintLineColor2.CurrentEndX := PhysicalEndPos; FPaintLineColor2.CurrentEndX := PhysicalEndPos;
// Calculate Markup // Calculate Markup
fMarkupManager.MergeMarkupAttributeAtRowCol(FFoldedLinesView.TextIndex[CurLine]+1, fMarkupManager.MergeMarkupAttributeAtRowCol(CurTextIndex+1,
PhysicalStartPos, PhysicalEndPos, FPaintLineColor2); PhysicalStartPos, PhysicalEndPos, FPaintLineColor2);
// Deal with equal colors // Deal with equal colors