[E-p-i-c-commits] org.epic.regexp/src/org/epic/regexp/views RegExpView.java,1.2,1.3

[Jochen L. <lue...@us...>]

Update of /cvsroot/e-p-i-c/org.epic.regexp/src/org/epic/regexp/views
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3738/src/org/epic/regexp/views

Modified Files:
	RegExpView.java 
Log Message:
Changed Text position update

Index: RegExpView.java
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.regexp/src/org/epic/regexp/views/RegExpView.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- RegExpView.java	27 Aug 2003 14:56:28 -0000	1.2
+++ RegExpView.java	1 May 2004 13:14:42 -0000	1.3
@@ -439,6 +439,12 @@
 					styleRange.background = (Color) colorTable.get(color);
 
 					matchText.setStyleRange(styleRange);
+					// Update text position
+					matchText.setTopIndex(styleRange.start);
+					matchText.setCaretOffset(styleRange.start);
+					int offsetFromLine = styleRange.start - matchText.getOffsetAtLine(matchText.getLineAtOffset(styleRange.start));
+					matchText.setHorizontalIndex(offsetFromLine);
+					matchText.redraw();
 
 					if (++color > colorTable.size()) {
 						color = 0;
@@ -692,6 +698,13 @@
 		styleRangeRegExp.length = pos.getEnd() - pos.getStart();
 
 		regExpText.setStyleRange(styleRangeRegExp);
+		
+		//	Update text position
+		regExpText.setTopIndex(styleRangeRegExp.start);
+		regExpText.setCaretOffset(styleRangeRegExp.start);
+		int offsetFromLine = styleRangeRegExp.start - regExpText.getOffsetAtLine(regExpText.getLineAtOffset(styleRangeRegExp.start));
+		regExpText.setHorizontalIndex(offsetFromLine);
+		regExpText.redraw();
 
 		// Colour the matching text
 		matchText.setStyleRange(null);
@@ -712,6 +725,12 @@
 					matches[i].getEndIndex(position)
 						- matches[i].getStartIndex(position);
 				matchText.setStyleRange(styleRangeMatch);
+				//	Update text position
+				matchText.setTopIndex(styleRangeMatch.start);
+				matchText.setCaretOffset(styleRangeMatch.start);
+				offsetFromLine = styleRangeMatch.start - matchText.getOffsetAtLine(matchText.getLineAtOffset(styleRangeMatch.start));
+				matchText.setHorizontalIndex(offsetFromLine);
+				matchText.redraw();
 			}
 
 		} else {