hg/stx-libwidg: comparison ListView.st

equal deleted inserted replaced

-:e2a1b5f187ef
+:e895ac4cc7c8
 tabPositions lineSpacing
 fontHeight fontAscent
 fontIsFixedWidth fontWidth
 normalFont boldFont italicFont
 autoScrollBlock autoScrollDeltaT
-searchPattern wordCheck'
+searchPattern wordCheck
+includesNonStrings'
 classVariableNames:''
 poolDictionaries:''
 category:'Views-Text'
 !
 ListView comment:'
 COPYRIGHT (c) 1989 by Claus Gittinger
 All Rights Reserved
-$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.8 1994-08-07 13:22:46 claus Exp $
+$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.9 1994-08-23 23:38:21 claus Exp $
 '!
 !ListView class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.8 1994-08-07 13:22:46 claus Exp $
+$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.9 1994-08-23 23:38:21 claus Exp $
 "
 !
 documentation
 "
 topMargin := (self verticalPixelPerMillimeter:0.5) rounded.
 textStartLeft := leftMargin + margin.
 textStartTop := topMargin + margin.
 innerWidth := width - textStartLeft - (margin * 2).
 self getFontParameters.
-wordCheck := [:char | char isNationalAlphaNumeric]
+wordCheck := [:char | char isNationalAlphaNumeric].
+includesNonStrings := false
 !
 initStyle
 super initStyle.
 "return the margin to left of 1st col"
 ^ leftMargin
 !
+setList:aCollection expandTabs:expandTabs
+"set the contents (a collection of strings);
+dont change position (i.e. do not scroll).
+This can be used to update a self-changing list
+(for example: a file list being shown, without disturbing user too much)"
+(aCollection isNil and:[list isNil]) ifTrue:[
+"no change"
+^ self
+].
+list := aCollection.
+list notNil ifTrue:[
+expandTabs ifTrue:[
+self expandTabs
+] ifFalse:[
+includesNonStrings := (list findFirst:[:l | l notNil and:[l isString not]]) ~~ 0.
+]
+].
+self contentsChanged.
+shown ifTrue:[
+self redrawFromVisibleLine:1 to:nLinesShown
+]
+!
 setList:aCollection
 "set the contents (a collection of strings);
 dont change position (i.e. do not scroll).
 This can be used to update a self-changing list
 (for example: a file list being shown, without disturbing user too much)"
-(aCollection isNil and:[list isNil]) ifTrue:[
+^ self setList:aCollection expandTabs:true
-"no change"
-^ self
-].
-list := aCollection.
-list notNil ifTrue:[
-self expandTabs
-].
-self contentsChanged.
-shown ifTrue:[
-self redrawFromVisibleLine:1 to:nLinesShown
-]
 !
 list:aCollection
 "set the contents (a collection of strings) and scroll to top-left"
 "set the contents (either a string or a Collection of strings)
 dont change position (i.e. do not scroll).
 This can be used to update a self-changing list
 (for example: a file list being shown, without disturbing user too much)."
-something isNil ifTrue:[
+|l|
-self setList:nil
-] ifFalse:[
+l := something.
-self setList:(something asText)
+l notNil ifTrue:[
-]
+	l isString ifTrue:[
+	    l := l asText
+	]
+].
+self setList:l
 !
 contents:something
 "set the contents (either a string or a Collection of strings)
 also scroll to top-left"
-something isNil ifTrue:[
+|l|
-self list:nil
-] ifFalse:[
+l := something.
-self list:(something asText)
+l notNil ifTrue:[
-]
+l isString ifTrue:[
+l := l asText
+]
+].
+self list:l
 !
 contents
 "return the contents as a string"
 |max|
 list isNil ifTrue:[^ 0].
-fontIsFixedWidth ifTrue:[
+includesNonStrings ifTrue:[
-max := self lengthOfLongestLine * fontWidth
+max := list
+inject:0
+into:[:maxSoFar :entry |
+(
+entry isNil ifTrue:[
+0
+] ifFalse:[
+entry isString ifTrue:[
+font widthOf:entry
+] ifFalse:[
+entry widthIn:self
+]
+]
+) max:maxSoFar.
+]
 ] ifFalse:[
-max := 0.
+fontIsFixedWidth ifTrue:[
-list notNil ifTrue:[
+max := self lengthOfLongestLine * fontWidth
-max := max max:(font widthOf:list)
+] ifFalse:[
+max := 0.
+list notNil ifTrue:[
+max := max max:(font widthOf:list)
+].
 ].
-].
+^ max + (leftMargin * 2)
-^ max + (leftMargin * 2)
+]
 !
 yOriginOfContents
 "return the vertical origin of the contents in pixels
 - used for scrollbar interface"
 |max      "{ Class: SmallInteger }"
 first    "{ Class: SmallInteger }"
 last     "{ Class: SmallInteger }"
 thisLen  "{ Class: SmallInteger }"
 listSize "{ Class: SmallInteger }" |
+includesNonStrings ifTrue:[
+^ width
+].
 fontIsFixedWidth ifTrue:[
 ^ (self lengthOfLongestLineBetween:firstLine and:lastLine) * fontWidth
 ].
 listSize := list size.
 "change origin to scroll down some lines"
 |w     "{ Class:SmallInteger }"
 h     "{ Class:SmallInteger }"
 m2    "{ Class:SmallInteger }"
-count "{ Class:SmallInteger }"|
+count "{ Class:SmallInteger }"
+prevFirst|
 count := nLines.
 (firstLineShown + nLines + nFullLinesShown > list size) ifTrue:[
 count := list size - firstLineShown - nFullLinesShown + 1
 ].
 count <= 0 ifTrue:[^ self].
 self originWillChange.
-(count >= nLinesShown) ifTrue:[
+prevFirst := firstLineShown.
 firstLineShown := firstLineShown + count.
-self redrawFromVisibleLine:1 to:nLinesShown.
+shown ifTrue:[
-self originChanged:(count negated)
+(count >= nLinesShown) ifTrue:[
-] ifFalse:[
+self redrawFromVisibleLine:1 to:nLinesShown.
-m2 := margin * 2.
+] ifFalse:[
-w := self widthForScrollBetween:firstLineShown
+m2 := margin * 2.
-and:(firstLineShown + nLinesShown).
+w := self widthForScrollBetween:prevFirst
-w := w + leftMargin.
+and:(prevFirst + nLinesShown).
+w := w + leftMargin.
-firstLineShown := firstLineShown + count.
 h := (fontHeight * count) + textStartTop.
 self catchExpose.
 self copyFrom:self x:margin y:h
 toX:margin y:textStartTop
 width:w height:(height - m2 - h).
 self redrawFromVisibleLine:(nFullLinesShown - count + 1)
 to:nLinesShown.
 self waitForExpose.
-self originChanged:(count negated).
+].
-]
+].
+self originChanged:count.
 !
 scrollDown
 "change origin to scroll down one line"
 scrollUp:nLines
 "change origin to scroll up some lines"
 |w      "{ Class:SmallInteger }"
 h      "{ Class:SmallInteger }"
-count  "{ Class:SmallInteger }"|
+count  "{ Class:SmallInteger }"
+prevFirst|
 count := nLines.
 count >= firstLineShown ifTrue:[
 count := firstLineShown - 1
 ].
 (count == 0) ifTrue:[^ self].
 self originWillChange.
-(count >= nLinesShown) ifTrue:[
+prevFirst := firstLineShown.
 firstLineShown := firstLineShown - count.
-self redrawFromVisibleLine:1 to:nLinesShown.
+shown ifTrue:[
-self originChanged:(count negated)
+(count >= nLinesShown) ifTrue:[
-] ifFalse:[
+self redrawFromVisibleLine:1 to:nLinesShown.
-w := self widthForScrollBetween:firstLineShown
+] ifFalse:[
-and:(firstLineShown + nLinesShown).
+w := self widthForScrollBetween:prevFirst
-w := w + leftMargin.
+and:(prevFirst + nLinesShown).
-firstLineShown := firstLineShown - count.
+w := w + leftMargin.
 h := (fontHeight * count) + topMargin.
 self catchExpose.
 self copyFrom:self x:margin y:topMargin
 toX:margin y:h
 width:w height:(height - h - margin).
 self redrawFromVisibleLine:1 to:count.
 self waitForExpose.
-self originChanged:(count negated).
+].
-]
+].
+self originChanged:(count negated).
 !
 scrollUp
 "change origin to scroll up one line"
 x := (self xOfCol:col inLine:visLineNr) - leftOffset.
 y := self yOfLine:visLineNr.
 self paint:bg.
-(lineString isNil or:[col > lineString size]) ifTrue:[
+(lineString notNil and:[lineString isString not]) ifTrue:[
-self fillRectangleX:x y:y width:(font widthOf:' ')
+self drawVisibleLine:visLineNr with:fg and:bg
-height:fontHeight.
-self paint:fg
 ] ifFalse:[
-characterString := (lineString at:col) asString.
+col > lineString size ifTrue:[
-self fillRectangleX:x y:y width:(font widthOf:characterString)
+self fillRectangleX:x y:y width:(font width) height:fontHeight.
-height:fontHeight.
+self paint:fg
-self paint:fg.
+] ifFalse:[
-self displayString:characterString x:x y:(y + fontAscent)
+characterString := (lineString at:col) asString.
+self fillRectangleX:x y:y
+width:(font widthOf:characterString)
+height:fontHeight.
+self paint:fg.
+self displayString:characterString x:x y:(y + fontAscent)
+]
 ]
 !
 drawVisibleLine:visLineNr from:startCol to:endCol with:fg and:bg
 "draw part of a visible line in fg/bg"
 |y x lineString len characterString|
 (endCol >= startCol) ifTrue:[
 lineString := self visibleAt:visLineNr.
-x := (self xOfCol:startCol inLine:visLineNr) - leftOffset.
-y := (self yOfLine:visLineNr).
+(lineString notNil and:[lineString isString not]) ifTrue:[
+self drawVisibleLine:visLineNr with:fg and:bg.
-len := lineString size.
-(startCol > len) ifTrue:[
-len := endCol - startCol + 1.
-self paint:bg.
-self fillRectangleX:x y:y
-width:(fontWidth * len)
-height:fontHeight
 ] ifFalse:[
-(endCol > len) ifTrue:[
+x := (self xOfCol:startCol inLine:visLineNr) - leftOffset.
-characterString := String new:endCol.
+y := (self yOfLine:visLineNr).
-characterString replaceFrom:1 to:len with:lineString startingAt:1.
+len := lineString size.
-lineString := characterString
+(startCol > len) ifTrue:[
-].
+len := endCol - startCol + 1.
 self paint:bg.
-self fillRectangleX:x y:y width:(font widthOf:lineString from:startCol to:endCol)
+self fillRectangleX:x y:y
-height:fontHeight.
+width:(fontWidth * len)
-self paint:fg.
+height:fontHeight
-self displayString:lineString from:startCol to:endCol x:x y:(y + fontAscent)
+] ifFalse:[
+(endCol > len) ifTrue:[
+characterString := String new:endCol.
+characterString replaceFrom:1 to:len with:lineString startingAt:1.
+lineString := characterString
+].
+self paint:bg.
+self fillRectangleX:x y:y width:(font widthOf:lineString from:startCol to:endCol)
+height:fontHeight.
+self paint:fg.
+self displayString:lineString from:startCol to:endCol x:x y:(y + fontAscent)
+]
 ]
 ]
 !
 drawVisibleLine:visLineNr from:startCol with:fg and:bg
 x := (self xOfCol:index1 inLine:visLineNr) - leftOffset.
 self paint:bg.
 self fillRectangleX:x y:y
 width:(width + leftOffset - x)
 height:fontHeight.
 lineString := self visibleAt:visLineNr.
 lineString notNil ifTrue:[
-index2 := lineString size.
+lineString isString ifFalse:[
-(index2 < index1) ifTrue:[^ self].
+self drawVisibleLine:visLineNr with:fg and:bg.
-(index1 <= index2) ifTrue:[
+] ifTrue:[
-self paint:fg.
+index2 := lineString size.
-self displayString:lineString from:index1 to:index2 x:x y:(y + fontAscent)
+(index2 < index1) ifTrue:[^ self].
+(index1 <= index2) ifTrue:[
+self paint:fg.
+self displayString:lineString from:index1 to:index2 x:x y:(y + fontAscent)
+]
 ]
 ]
 !
 drawFromVisibleLine:startVisLineNr to:endVisLineNr with:fg and:bg
 ].
 (w > (width // 4 * 3)) ifTrue:[
 "if area is big enough redraw whole lines"
 self redrawFromVisibleLine:startLine to:stopLine
 ] ifFalse:[
-fontIsFixedWidth ifFalse:[
+includesNonStrings ifTrue:[
-"start/end col has to be computed for each line"
 startLine to:stopLine do:[:i |
-startCol := self colOfX:x inVisibleLine:i.
+self redrawVisibleLine:i
-endCol := self colOfX:(x + w) inVisibleLine:i.
+]
+] ifFalse:[
+fontIsFixedWidth ifFalse:[
+"start/end col has to be computed for each line"
+startLine to:stopLine do:[:i |
+startCol := self colOfX:x inVisibleLine:i.
+endCol := self colOfX:(x + w) inVisibleLine:i.
+startCol > 0 ifTrue:[
+endCol > 0 ifTrue:[
+self redrawVisibleLine:i from:startCol to:endCol
+]
+]
+]
+] ifTrue:[
+"start/end col is the same for all lines"
+startCol := self colOfX:x inVisibleLine:startLine.
+endCol := self colOfX:(x + w) inVisibleLine:startLine.
 startCol > 0 ifTrue:[
 endCol > 0 ifTrue:[
-self redrawVisibleLine:i from:startCol to:endCol
+startLine to:stopLine do:[:i |
-]
+self redrawVisibleLine:i from:startCol to:endCol
 ]
-]
-] ifTrue:[
-"start/end col is the same for all lines"
-startCol := self colOfX:x inVisibleLine:startLine.
-endCol := self colOfX:(x + w) inVisibleLine:startLine.
-startCol > 0 ifTrue:[
-endCol > 0 ifTrue:[
-startLine to:stopLine do:[:i |
-self redrawVisibleLine:i from:startCol to:endCol
 ]
 ]
 ]
 ]
 ]

changeset 51	e895ac4cc7c8
parent 38	4b9b70b2cc87
child 59	450ce95a72a4