hg/stx-libwidg: comparison TextView.st

equal deleted inserted replaced

-:f800d9ec09a8
+:eed79a96e43b
 (y > height) ifTrue:[
 self compressMotionEvents:false.
 self startAutoScrollDown:(y - height).
 ^ self
 ].
-((x < 0) and:[leftOffset ~~ 0]) ifTrue:[
+((x < 0) and:[viewOrigin x ~~ 0]) ifTrue:[
 self compressMotionEvents:false.
 self startAutoScrollLeft:x.
 ^ self
 ].
 (x > width) ifTrue:[
 self searchForMatchingParenthesisFromLine:selectionStartLine col:selectionStartCol
 ifFound:[:line :col |
 |prevLine prevCol moveBack pos1|
 prevLine := firstLineShown.
-prevCol := leftOffset.
+prevCol := viewOrigin x.
 self selectFromLine:selectionStartLine col:selectionStartCol
 toLine:line col:col.
 self sensor ctrlDown ifFalse:[
 "/ undo scroll operation ...
 self withCursor:Cursor eye do:[
 |delayCount|
 moveBack := false.
 (')]}>' includes:ch) ifTrue:[
-(firstLineShown ~~ prevLine or:[prevCol ~~ leftOffset]) ifTrue:[
+(firstLineShown ~~ prevLine or:[prevCol ~~ viewOrigin x]) ifTrue:[
 moveBack := true
 ]
 ] ifFalse:[
 selectionEndLine > (firstLineShown + nFullLinesShown) ifTrue:[
 self makeLineVisible:selectionEndLine.
 "redraw visible line lineNr"
 |len line l|
 selectionStartLine notNil ifTrue:[
-	line := self visibleLineToAbsoluteLine:visLine.
+line := self visibleLineToAbsoluteLine:visLine.
-	(line between:selectionStartLine and:selectionEndLine) ifTrue:[
+(line between:selectionStartLine and:selectionEndLine) ifTrue:[
-	    (line == selectionStartLine) ifTrue:[
+(line == selectionStartLine) ifTrue:[
-		(line == selectionEndLine) ifTrue:[
+(line == selectionEndLine) ifTrue:[
-		    "its part-of-single-line selection"
+"its part-of-single-line selection"
-		    self clearMarginOfVisibleLine:visLine with:bgColor.
+self clearMarginOfVisibleLine:visLine with:bgColor.
-		    (selectionStartCol > 1) ifTrue:[
+(selectionStartCol > 1) ifTrue:[
-			super redrawVisibleLine:visLine
+super redrawVisibleLine:visLine
-					   from:1
+from:1
-					     to:(selectionStartCol - 1)
+to:(selectionStartCol - 1)
-		    ].
+].
-		    self drawVisibleLine:visLine from:selectionStartCol
+self drawVisibleLine:visLine from:selectionStartCol
-						   to:selectionEndCol
+to:selectionEndCol
-						 with:selectionFgColor
+with:selectionFgColor
-						  and:selectionBgColor.
+and:selectionBgColor.
-		    super redrawVisibleLine:visLine
+super redrawVisibleLine:visLine
-				       from:(selectionEndCol + 1).
+from:(selectionEndCol + 1).
-		    ^ self
+^ self
-		].
+].
-		"its the first line of a multi-line selection"
+"its the first line of a multi-line selection"
-		(selectionStartCol ~~ 1) ifTrue:[
+(selectionStartCol ~~ 1) ifTrue:[
-		    self clearMarginOfVisibleLine:visLine with:bgColor.
+self clearMarginOfVisibleLine:visLine with:bgColor.
-		    super redrawVisibleLine:visLine
+super redrawVisibleLine:visLine
-				       from:1
+from:1
-					 to:(selectionStartCol - 1)
+to:(selectionStartCol - 1)
-		] ifFalse:[
+] ifFalse:[
-		    leftOffset == 0 ifTrue:[
+viewOrigin x == 0 ifTrue:[
-			self clearMarginOfVisibleLine:visLine with:selectionBgColor.
+self clearMarginOfVisibleLine:visLine with:selectionBgColor.
-		    ]
+]
-		].
+].
-		self drawVisibleLine:visLine from:selectionStartCol
+self drawVisibleLine:visLine from:selectionStartCol
-				with:selectionFgColor and:selectionBgColor.
+with:selectionFgColor and:selectionBgColor.
-		^ self
+^ self
-	    ].
+].
-	    (line == selectionEndLine) ifTrue:[
+(line == selectionEndLine) ifTrue:[
-		"its the last line of a multi-line selection"
+"its the last line of a multi-line selection"
-		(selectionEndCol == 0) ifTrue:[
+(selectionEndCol == 0) ifTrue:[
-		    ^ super redrawVisibleLine:visLine
+^ super redrawVisibleLine:visLine
-		].
+].
-		l := self visibleAt:selectionEndLine.
+l := self visibleAt:selectionEndLine.
-		len := l size.
+len := l size.
-		self clearMarginOfVisibleLine:visLine with:selectionBgColor.
+self clearMarginOfVisibleLine:visLine with:selectionBgColor.
-		self drawVisibleLine:visLine from:1 to:selectionEndCol
+self drawVisibleLine:visLine from:1 to:selectionEndCol
-				with:selectionFgColor and:selectionBgColor.
+with:selectionFgColor and:selectionBgColor.
-		super redrawVisibleLine:visLine from:(selectionEndCol + 1).
+super redrawVisibleLine:visLine from:(selectionEndCol + 1).
-		^ self
+^ self
-	    ].
+].
-	    "its a full line in a multi-line selection"
+"its a full line in a multi-line selection"
-	    self clearMarginOfVisibleLine:visLine with:selectionBgColor.
+self clearMarginOfVisibleLine:visLine with:selectionBgColor.
-	    self drawVisibleLine:visLine with:selectionFgColor and:selectionBgColor.
+self drawVisibleLine:visLine with:selectionFgColor and:selectionBgColor.
-	    ^ self
+^ self
-	]
+]
 ].
 super redrawVisibleLine:visLine
 "Modified: 6.3.1996 / 14:22:19 / cg"
 !
 ! !
 !TextView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.171 2001-10-02 18:03:26 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.172 2001-10-05 08:56:11 cg Exp $'
 ! !

changeset 2429	eed79a96e43b
parent 2421	bccbb97e8ab6
child 2442	914a5ef62334