hg/stx-libwidg: comparison ListView.st

equal deleted inserted replaced

-:5fb77774d29c
+:6d3c864f0a03
 list isNil ifTrue:[list := OrderedCollection new].
 list add:aString.
 includesNonStrings ifFalse:[
-includesNonStrings := (aString notNil and:[(aString isMemberOf:String) not]).
+includesNonStrings := (aString notNil and:[(aString isSingleByteString) not]).
 includesNonStrings ifTrue:[
 fontHeightBefore := fontHeight.
 self getFontParameters.
 fontHeightBefore ~~ fontHeight ifTrue:[
 self invalidate
 widthOfWidestLine notNil ifTrue:[
 self recomputeWidthOfWidestLineFor:aString old:nil.
 ].
 includesNonStrings ifFalse:[
-includesNonStrings := (aString notNil and:[(aString isMemberOf:String) not]).
+includesNonStrings := (aString notNil and:[(aString isSingleByteString) not]).
 "/        includesNonStrings ifTrue:[self getFontParameters].
 ].
 shown ifTrue:[
 lastShown := self lastLineShown.
 index <= 2 ifTrue:[
 ].
 includesNonStrings ifFalse:[
 includesNonStrings :=
 aCollectionOfLines
 contains:[:someLine |
-someLine notNil and:[(someLine isMemberOf:String) not].
+someLine notNil and:[(someLine isSingleByteString) not].
 ]
 ].
 widthOfWidestLine notNil ifTrue:[
 aCollectionOfLines do:[:eachLine |
 self textChanged
 ].
 didIncludeNonStrings := includesNonStrings.
 includesNonStrings ifFalse:[
-includesNonStrings := (aString notNil and:[(aString isMemberOf:String) not]).
+includesNonStrings := (aString notNil and:[(aString isSingleByteString) not]).
 ] ifTrue:[
-(aString isNil or:[(aString isMemberOf:String)]) ifTrue:[
+(aString isNil or:[(aString isSingleByteString)]) ifTrue:[
-includesNonStrings := list contains:[:l | l notNil and:[(l isMemberOf:String) not]].
+includesNonStrings := list contains:[:l | l notNil and:[(l isSingleByteString) not]].
 ]
 ].
 includesNonStrings ~~ didIncludeNonStrings ifTrue:[
 self getFontParameters.
 x := (self xOfCol:sCol inVisibleLine:visLineNr) - viewOrigin x.
 y := (self yOfVisibleLine:visLineNr).
 yf := y - (lineSpacing // 2).
 len := lineString size.
-(lineString notNil and:[(lineString isMemberOf:String) not ])
+(lineString notNil and:[lineString isString not ])
 ifTrue:[
 w := lineString widthFrom:sCol to:(endCol min:len) on:self.
 endCol > len ifTrue:[
 sCol > len ifTrue:[
 numExtraCols := (endCol - sCol + 1).
 "/ remove any color emphasis, to enforce drawing in fg/bg
 lineString := self withoutColorEmphasis:lineString ifFg:fg andBg:bg.
 backgroundAlreadyClearedColor == bg ifFalse:[
-(lineString isMemberOf:String) ifTrue:[
+(lineString isSingleByteString) ifTrue:[
 fontIsFixedWidth ifTrue:[
 w := (eCol - sCol + 1) * fontWidth
 ] ifFalse:[
 w := font widthOf:lineString from:sCol to:eCol
 ]
 "includes non strings or area is big enough: redraw whole lines"
 self redrawFromVisibleLine:startLine to:stopLine
 ] ifFalse:[
 line := self visibleAt:startLine.
-(fontIsFixedWidth and:[line isMemberOf:String]) ifFalse:[
+(fontIsFixedWidth and:[line isSingleByteString]) 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.
 endCol := self colOfX:(x + w) inVisibleLine:startLine.
 startCol > 0 ifTrue:[
 endCol > 0 ifTrue:[
 startLine to:stopLine do:[:i |
 line := self visibleAt:i.
-(line isMemberOf:String) ifTrue:[
+(line isSingleByteString) ifTrue:[
 self redrawVisibleLine:i from:startCol to:endCol
 ] ifFalse:[
 self redrawVisibleLine:i
 ]
 ]
 "/
 hMax := list inject:hMax into:[:maxSoFar :thisLine |
 thisLine isNil ifTrue:[
 maxSoFar
 ] ifFalse:[
-(thisLine isMemberOf:String) ifTrue:[
+(thisLine isSingleByteString) ifTrue:[
 maxSoFar
 ] ifFalse:[
 maxSoFar max:(thisLine heightOn:self)
 ]
 ]
 widthOfWidestLine notNil ifTrue:[
 newEntry isNil ifTrue:[
 newW := 0
 ] ifFalse:[
-(newEntry isMemberOf:String) ifTrue:[
+(newEntry isSingleByteString) ifTrue:[
 newW := font widthOf:newEntry
 ] ifFalse:[
 newW := newEntry widthOn:self
 ].
 ].
 widthOfWidestLine := newW.
 ] ifFalse:[
 oldEntry isNil ifTrue:[
 oldW := 0
 ] ifFalse:[
-(oldEntry isMemberOf:String) ifTrue:[
+(oldEntry isSingleByteString) ifTrue:[
 oldW := font widthOf:oldEntry
 ] ifFalse:[
 oldW := oldEntry widthOn:self
 ].
 ].
 widthOfLineString:entry
 "return the width of an entry"
 entry isNil ifTrue:[^ 0].
-(entry isMemberOf:String) ifTrue:[
+(entry isSingleByteString) ifTrue:[
 ^ font widthOf:entry
 ].
 ^ entry widthOn:self
 "Modified: 12.5.1996 / 20:09:53 / cg"
 last := listSize
 ].
 self from:first to:last do:[:line |
 line notNil ifTrue:[
-(line isMemberOf:String) ifTrue:[
+(line isSingleByteString) ifTrue:[
 thisLen := font widthOf:line
 ] ifFalse:[
 thisLen := line widthOn:self
 ].
 (thisLen > max) ifTrue:[
 ] ifFalse:[
 tcol := col - 1.
 line := self visibleAt:visLineNr.
 (fontIsFixedWidth
-and:[line isNil or:[line isMemberOf:String]])
+and:[line isNil or:[line isSingleByteString]])
 ifTrue:[
 lText := (tcol * fontWidth)
 ] ifFalse:[
 line notNil ifTrue:[
 lineSize := line string size
 lText := (tcol * fontWidth)
 ] ifFalse:[
 (lineSize < col) ifTrue:[
 lText := (line widthOn:self) + (fontWidth * (tcol - lineSize))
 ] ifFalse:[
-(line isMemberOf:String) ifTrue:[
+(line isSingleByteString) ifTrue:[
 lText := (font widthOf:line from:1 to:tcol)
 ] ifFalse:[
 lText := line widthFrom:1 to:tcol on:self.
 ]
 ]
 start to:stop do:[:lineNr |
 |entry w|
 entry := list at:lineNr.
 entry notNil ifTrue:[
-(entry isMemberOf:String) ifTrue:[
+(entry isSingleByteString) ifTrue:[
 w := f widthOf:entry
 ] ifFalse:[
 w := entry widthOn:self
 ].
 max := max max:w.
 start to:stop do:[:lineNr |
 |line|
 line := list at:lineNr.
 line notNil ifTrue:[
-(line isMemberOf:String) ifTrue:[
+(line isSingleByteString) ifTrue:[
 line size > lengthOfLongestString ifTrue:[
 lengthOfLongestString := line size
 ].
 ] ifFalse:[
 max := max max:(line widthOn:self)
 "/ mhmh - really dont know yet
 d := Screen current
 ].
 f := font := font onDevice:d.
-(line isMemberOf:String) ifTrue:[
+(line isSingleByteString) ifTrue:[
 ^ f widthOf:line
 ].
 ^ line widthOn:self
 "Created: / 10.11.1998 / 23:59:20 / cg"
 ! !
 !ListView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.398 2014-07-06 12:43:22 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.399 2014-07-12 05:39:50 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.398 2014-07-06 12:43:22 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.399 2014-07-12 05:39:50 cg Exp $'
 ! !

changeset 5111	6d3c864f0a03
parent 5096	2c222bef8f8e
child 5128	787b617a99e5
child 5198	8aeb2f4089c9