From ae11c87ef7d0d0c3019c8f909390b2bd9ca788f7 Mon Sep 17 00:00:00 2001 From: martin Date: Sat, 17 Dec 2011 11:18:04 +0000 Subject: [PATCH] SynEdit: refactor git-svn-id: trunk@34241 - --- components/synedit/synedit.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/synedit/synedit.pp b/components/synedit/synedit.pp index 7e7b0ee6a2..2fbbb7c760 100644 --- a/components/synedit/synedit.pp +++ b/components/synedit/synedit.pp @@ -3649,8 +3649,8 @@ var else Attr := nil; repeat - MarkupInfo := fMarkupManager.GetMarkupAttributeAtRowCol(FFoldedLinesView.TextIndex[CurLine]+1, NextPos); - NextPos := fMarkupManager.GetNextMarkupColAfterRowCol(FFoldedLinesView.TextIndex[CurLine]+1, NextPos); + MarkupInfo := fMarkupManager.GetMarkupAttributeAtRowCol(CurTextIndex+1, NextPos); + NextPos := fMarkupManager.GetNextMarkupColAfterRowCol(CurTextIndex+1, NextPos); if Assigned(Attr) then begin @@ -3906,7 +3906,7 @@ var // Calculate Token Sublen for current Markup NextPhysPos := fMarkupManager.GetNextMarkupColAfterRowCol - (FFoldedLinesView.TextIndex[CurLine]+1, PhysicalStartPos); + (CurTextIndex+1, PhysicalStartPos); if NextPhysPos < 1 then SubCharLen := TokenCharLen else SubCharLen := NextPhysPos - PhysicalStartPos; @@ -3924,7 +3924,7 @@ var FPaintLineColor2.CurrentEndX := PhysicalEndPos; // Calculate Markup - fMarkupManager.MergeMarkupAttributeAtRowCol(FFoldedLinesView.TextIndex[CurLine]+1, + fMarkupManager.MergeMarkupAttributeAtRowCol(CurTextIndex+1, PhysicalStartPos, PhysicalEndPos, FPaintLineColor2); // Deal with equal colors