hg/stx-libwidg: comparison ListView.st

equal deleted inserted replaced

-:f800d9ec09a8
+:eed79a96e43b
 If scan is true, scan the passed list for nonStrings;
 otherwise, take the information from the nonStrings arg.
 (the nonStrings information is remembered to optimize later redraws & height computations)."
 |oldFirst oldLeft nonStringsBefore fontHeightBefore
-scrollToEnd scrollToTop|
+scrollToEnd scrollToTop newLeftOffset|
 scrollToTop := scrollWhenUpdating == #begin or:[scrollWhenUpdating == #beginOfText].
 scrollToEnd := scrollWhenUpdating == #end or:[scrollWhenUpdating == #endOfText].
 (aCollection isNil and:[list isNil]) ifTrue:[
 "no contents change"
 scrollToTop ifTrue:[
 self scrollToTop.
-self scrollToLeft.
 ] ifFalse:[
 scrollToEnd ifTrue:[
 self scrollToBottom.
 ]
 ].
+self scrollToLeft.
 ^ self
 ].
 list := aCollection.
 nonStringsBefore := includesNonStrings.
 self getFontParameters.
 ].
 widthOfWidestLine := nil.   "/ i.e. unknown
 oldFirst := firstLineShown.
-oldLeft := leftOffset.
+oldLeft := viewOrigin x.
 (includesNonStrings ~~ nonStringsBefore) ifTrue:[
 self computeNumberOfLinesShown.
 ].
+newLeftOffset := viewOrigin x.
 scrollToTop ifTrue:[
 firstLineShown := 1.
-leftOffset := 0.
+newLeftOffset := 0.
 ] ifFalse:[
 scrollToEnd ifTrue:[
 firstLineShown := (list size - nFullLinesShown + 1) max:1.
-leftOffset := 0.
+newLeftOffset := 0.
 ]
+].
+newLeftOffset > 0 ifTrue:[
+self widthOfContents <= self innerWidth ifTrue:[
+newLeftOffset := 0.
+].
+].
+newLeftOffset ~= oldLeft ifTrue:[
+viewOrigin := newLeftOffset @ viewOrigin y.
 ].
 realized ifTrue:[
 self contentsChanged.
 "
 (for example: a file list being shown, without disturbing the user too much)"
 |oldFirst nonStringsBefore linesShownBefore|
 (aCollection isNil and:[list isNil]) ifTrue:[
-	"no change"
+"no change"
-	^ self
+^ self
 ].
 "/    list isNil ifTrue:[
 "/        linesShownBefore := (1 to:nLinesShown) collect:[:i | ''].
 "/    ] ifFalse:[
 nonStringsBefore := includesNonStrings.
 includesNonStrings := false.
 list notNil ifTrue:[
-	expandTabs ifTrue:[
+expandTabs ifTrue:[
-	    self expandTabs
+self expandTabs
-	] ifFalse:[
+] ifFalse:[
-	    includesNonStrings := (list findFirst:[:e | e isString not]) ~~ 0.
+includesNonStrings := (list findFirst:[:e | e isString not]) ~~ 0.
-	].
+].
 ].
 (includesNonStrings ~~ nonStringsBefore) ifTrue:[
-	self getFontParameters.
+self getFontParameters.
-	self computeNumberOfLinesShown.
+self computeNumberOfLinesShown.
 ].
 "/ new - reposition horizontally if too big
 widthOfWidestLine := nil.   "/ i.e. unknown
 innerWidth >= self widthOfContents ifTrue:[
-	viewOrigin x:0.
+viewOrigin := 0 @ viewOrigin y.
-	leftOffset := 0.
 ].
 self contentsChanged.
 "/ new - reposition vertically if too big
 (firstLineShown + nFullLinesShown) > self size ifTrue:[
-	oldFirst := firstLineShown.
+oldFirst := firstLineShown.
-	firstLineShown := self size - nFullLinesShown + 1.
+firstLineShown := self size - nFullLinesShown + 1.
-	firstLineShown < 1 ifTrue:[firstLineShown := 1].
+firstLineShown < 1 ifTrue:[firstLineShown := 1].
-	viewOrigin y:(firstLineShown - 1 * fontHeight).
+viewOrigin y:(firstLineShown - 1 * fontHeight).
-	self originChanged:0 @ ((oldFirst - 1) negated * fontHeight).
+self originChanged:0 @ ((oldFirst - 1) negated * fontHeight).
-	linesShownBefore := nil.
+linesShownBefore := nil.
-	shown ifTrue:[
+shown ifTrue:[
-	    self clear.
+self clear.
-	]
+]
 ].
 "/ end new
 (shown and:[doRedraw]) ifTrue:[
-	  self redrawFromVisibleLine:1 to:nLinesShown
+self redrawFromVisibleLine:1 to:nLinesShown
 "/        linesShownBefore isNil ifTrue:[
 "/            self redrawFromVisibleLine:1 to:nLinesShown
 "/        ] ifFalse:[
 "/            1 to:nLinesShown do:[:l |
 ] ifFalse:[
 e := endLine
 ].
 (startLine <= e) ifTrue:[
-x := textStartLeft - leftOffset.
+x := textStartLeft - viewOrigin x.
 self paint:fg on:bg.
 self from:startLine to:e do:[:line |
 line notNil ifTrue:[
 "/ remove lines color emphasis, to enforce color.
 "/ otherwise blue text is not visible if selection-bg is blue
 !
 drawLine:line inVisible:visLineNr with:fg and:bg
 "draw a given string at visible lines position in fg/bg"
-self drawLine:line atX:(textStartLeft - leftOffset) inVisible:visLineNr with:fg and:bg
+self drawLine:line atX:(textStartLeft - viewOrigin x) inVisible:visLineNr with:fg and:bg
 !
 drawVisibleLine:visLineNr col:col with:fg and:bg
 "draw single character at col index of visible line in fg/bg"
 lineString := self visibleAt:visLineNr.
 (lineString notNil and:[lineString isString not]) ifTrue:[
 ^ self drawVisibleLine:visLineNr with:fg and:bg
 ].
-x := (self xOfCol:col inVisibleLine:visLineNr) - leftOffset.
+x := (self xOfCol:col inVisibleLine:visLineNr) - viewOrigin x.
 y := self yOfVisibleLine:visLineNr.
 self paint:bg.
 yf := y - (lineSpacing // 2).
 col > lineString size ifTrue:[
 (lineString notNil and:[lineString isString not])
 ifTrue:[
 self drawVisibleLine:visLineNr with:fg and:bg.
 ] ifFalse:[
-x := (self xOfCol:sCol inVisibleLine:visLineNr) - leftOffset.
+x := (self xOfCol:sCol inVisibleLine:visLineNr) - viewOrigin x.
 y := (self yOfVisibleLine:visLineNr).
 yf := y - (lineSpacing // 2).
 len := lineString size.
 (sCol > len) ifTrue:[
 index1 := 1
 ] ifFalse:[
 index1 := startCol
 ].
 y := self yOfVisibleLine:visLineNr.
-x := (self xOfCol:index1 inVisibleLine:visLineNr) - leftOffset.
+x := (self xOfCol:index1 inVisibleLine:visLineNr) - viewOrigin x.
 backgroundAlreadyClearedColor == bg ifFalse:[
 self paint:bg.
 self fillRectangleX:x y:y - (lineSpacing // 2)
-width:(width + leftOffset - x)
+width:(width + viewOrigin x - x)
 height:fontHeight.
 ].
 lineString := self visibleAt:visLineNr.
 lineString notNil ifTrue:[
 lineString isString ifFalse:[
 drawVisibleLine:visLineNr with:fg and:bg
 "draw a visible line in fg/bg"
 self
-	drawLine:(self visibleAt:visLineNr)
+drawLine:(self visibleAt:visLineNr)
-	atX:(textStartLeft - leftOffset)
+atX:(textStartLeft - viewOrigin x)
-	inVisible:visLineNr
+inVisible:visLineNr
-	with:fg
+with:fg
-	and:bg
+and:bg
 "Modified: 28.2.1996 / 19:30:23 / cg"
 !
 fillRectangleX:x y:y width:w height:h
 bitGravity := #NorthWest.
 list := nil.
 firstLineShown := 1.
 nFullLinesShown := 1. "just any value ..."
 nLinesShown := 1.     "just any value"
-leftOffset := 0.
 partialLines := true.
 tabPositions := UserDefaultTabPositions ? DefaultTabPositions.
 includesNonStrings := false.
 self getFontParameters.
 wordCheck := [:char | char isNationalAlphaNumeric].
 "given a visible lineNr and x-coordinate, return colNr"
 |lineString linePixelWidth xRel runCol posLeft posRight done
 hasEmphasis oPosRight oPosLeft|
-xRel := x - textStartLeft + leftOffset.
+xRel := x - textStartLeft + viewOrigin x.
 (xRel <= 0) ifTrue:[^ 1].
 lineString := self visibleAt:visLineNr.
 "
 "/ (avoid endless loop if the binary search does not make progress)
 done := true.
 ]
 ].
 "/self paint:Color red.
-"/self displayRectangleX:posLeft+textStartLeft-leftOffset y:(self yOfVisibleLine:visLineNr)
+"/self displayRectangleX:posLeft+textStartLeft-viewOrigin x y:(self yOfVisibleLine:visLineNr)
 "/                       width:(posRight-posLeft) height:fontHeight.
 "/self paint:Color black.
 ^ runCol
 "Modified: / 8.9.1998 / 21:18:42 / cg"
 xOriginOfContents
 "return the horizontal origin of the contents in pixels
 - used for scrollbar interface"
-^ leftOffset
+^ viewOrigin x
 !
 yOriginOfContents
 "return the vertical origin of the contents in pixels
 - used for scrollbar interface"
 visLnr := self listLineToVisibleLine:aLineNr.
 visLnr isNil ifTrue:[^ self].
 xWant := self xOfCol:aCol inVisibleLine:visLnr.
-xVis := xWant - leftOffset.
+xVis := xWant - viewOrigin x.
 "
 dont scroll, if already visible
 (but scroll, if not in inner 20%..80% of visible area)
 "
 scrollHorizontalTo:aPixelOffset
 "change origin to make aPixelOffset be the left col"
 |nPixel|
-nPixel := aPixelOffset - leftOffset.
+nPixel := aPixelOffset - viewOrigin x.
 nPixel ~~ 0 ifTrue:[
 self scrollTo:(viewOrigin + (nPixel @ 0)) redraw:true
 ]
 "Modified: / 3.3.1999 / 22:55:20 / cg"
 !
 scrollToCol:aColNr
 "change origin to make aColNr be the left col"
-|pxlOffset|
+|pxlOffset leftOffset|
+leftOffset := viewOrigin x.
 aColNr == 1 ifTrue:[
-	leftOffset ~~ 0 ifTrue:[
+leftOffset ~~ 0 ifTrue:[
-	    self scrollLeft:leftOffset.
+self scrollLeft:leftOffset.
-	].
+].
-	^ self
+^ self
 ].
 pxlOffset := font width * (aColNr - 1).
 pxlOffset < leftOffset ifTrue:[
-	self scrollLeft:(leftOffset - pxlOffset)
+self scrollLeft:(leftOffset - pxlOffset)
 ] ifFalse:[
-	pxlOffset > leftOffset ifTrue:[
+pxlOffset > leftOffset ifTrue:[
-	    self scrollRight:(pxlOffset - leftOffset)
+self scrollRight:(pxlOffset - leftOffset)
-	]
+]
 ]
 !
 scrollToLeft
 "change origin to start (left) of text"
-leftOffset ~~ 0 ifTrue:[
+viewOrigin x ~~ 0 ifTrue:[
-	self scrollToCol:1
+self scrollToCol:1
 ]
 !
 scrollToLine:aLineNr
 "change origin to make aLineNr be the top line"
 w    "{ Class:SmallInteger }"
 y0   "{ Class:SmallInteger }"
 y1   "{ Class:SmallInteger }"
 y    "{ Class:SmallInteger }"
 x    "{ Class:SmallInteger }"
-delta newFirstLine newViewOrigin newLeftOffset
+delta newFirstLine newViewOrigin
 hBefore wBefore inv wg|
 hBefore := height.
 wBefore := width.
 dltOrg := anOrigin - viewOrigin.
 "/  compute valid horizontal offset x
 (x := dltOrg x) ~~ 0 ifTrue:[
-tmp := leftOffset + x.
+tmp := viewOrigin x + x.
 x < 0 ifTrue:[                                          "/ scrolling left
-tmp < 0 ifTrue:[x := 0 - leftOffset]
+tmp < 0 ifTrue:[x := 0 - viewOrigin x]
 ] ifFalse:[                                             "/ scrolling right
 "/ allows scrolling to the right of widest line
 max := self widthOfContents + (self additionalMarginForHorizontalScroll).
 tmp + width > max ifTrue:[
-x := (max - leftOffset - width) max:0
+x := (max - viewOrigin x - width) max:0
 ]
 ]
 ].
 "/  compute valid vertical offset measured in lines
 ].
 delta := (x @ y).
 newFirstLine := firstLineShown + noLn.
 newViewOrigin := viewOrigin + delta.
-newLeftOffset := newViewOrigin x max:0.
 (shown and:[doRedraw]) ifFalse:[
 self originWillChange.
 firstLineShown := newFirstLine.
 viewOrigin := newViewOrigin.
-leftOffset := newLeftOffset.
 ^ self originChanged:delta
 ].
 "/    (self sensor notNil and: [self sensor hasExposeEventFor:self]) ifTrue:[               "/ outstanding expose events
 "/        self invalidate.                                        "/ redraw all
 or:[(x abs) > (width // 4 * 3)]]  "/ big enough to redraw all
 ) ifTrue:[
 self originWillChange.
 firstLineShown := newFirstLine.
 viewOrigin := newViewOrigin.
-leftOffset := newLeftOffset.
 self invalidate.
 ^ self originChanged:delta
 ].
 "/ OLD:
 inv := (y1@margin) extent:(y0@h).
 ].
 firstLineShown := newFirstLine.
 viewOrigin := newViewOrigin.
-leftOffset := newLeftOffset.
 self invalidateDeviceRectangle:inv repairNow:false.
 self originChanged:delta.
 self waitForExpose.
 ! !
 !ListView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.256 2001-10-04 16:53:32 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.257 2001-10-05 08:55:19 cg Exp $'
 ! !

changeset 2429	eed79a96e43b
parent 2427	43cc7ea39bac
child 2430	d8f21cf216fb