hg/stx-libwidg2: comparison ListModelView.st

equal deleted inserted replaced

-:fa192ee81bb5
+:c5651fcf9770
 "{ Package: 'stx:libwidg2' }"
 View subclass:#ListModelView
-	instanceVariableNames:'list listHolder textStartLeft viewOrigin enabled fgColor bgColor
+	instanceVariableNames:'list listHolder textStartLeft textStartTop viewOrigin enabled
-		lineSpacing widthOfContents computeWidthInRange startOfLinesY
+		fgColor bgColor lineSpacing widthOfContents computeWidthInRange
-		autoScroll autoScrollBlock scrollWhenUpdating hasConstantHeight
+		startOfLinesY autoScroll autoScrollBlock scrollWhenUpdating
-		constantHeight previousExtent renderer'
+		hasConstantHeight constantHeight previousExtent renderer'
 	classVariableNames:'DefaultForegroundColor DefaultBackgroundColor DefaultShadowColor
 		DefaultLightColor StopRedrawSignal'
 	poolDictionaries:''
 	category:'Views-Lists'
 !
 list addDependent:self
 ].
 preferredExtent := nil.
 widthOfContents := nil.
-self realized ifFalse:[^ self].
+realized ifTrue:[
+self recomputeHeightOfContents.
-self recomputeHeightOfContents.
+scrollWhenUpdating == #beginOfText ifTrue:[
+viewOrigin = (0@0) ifFalse:[
+self originWillChange.
-scrollWhenUpdating == #beginOfText ifTrue:[
+negatedOrg := viewOrigin negated.
-viewOrigin = (0@0) ifFalse:[
+viewOrigin := (0@0).
-self originWillChange.
+self originChanged:negatedOrg.
-negatedOrg := viewOrigin negated.
+].
-viewOrigin := (0@0).
+] ifFalse:[
-self originChanged:negatedOrg.
+scrollWhenUpdating == #endOfText ifTrue:[
-].
+self scrollTo:(0 @ self heightOfContents - self innerHeight) redraw:false
-] ifFalse:[
+]
-scrollWhenUpdating == #endOfText ifTrue:[
+].
-self scrollTo:(0 @ self heightOfContents - self innerHeight) redraw:false
+self invalidate.
-]
+].
-].
-self invalidate.
 self contentsChanged
 !
 renderer
 "returns the used renderer
 !
 hasConstantHeight
-"user configured; true if each line has the same lineHeight
+"user configured; true if each line has the same lineHeight.
-optimize for scroller update
+Optimizes scroll and redraw operations
 "
 ^ hasConstantHeight
 !
 hasConstantHeight:aBool
-"user configured; true if each line has the same lineHeight
+"user configured; true if each line has the same lineHeight.
-optimize for scroller update
+Optimizes scrolling and redraw.
 "
 aBool == hasConstantHeight ifTrue:[
-	^ self
+^ self
 ].
 constantHeight    := nil.
 hasConstantHeight := aBool.
 self lostSynchronisation.
 (font widthOn:device) ~~ oldWidth ifTrue:[       "/ force a recomputation
 preferredExtent := nil.
 widthOfContents := nil.
 ].
-oldHeight ~~ (font heightOn:device) ifTrue:[
+realized ifTrue:[
-self recomputeHeightOfContents.
+oldHeight ~~ (font heightOn:device) ifTrue:[
-].
+self recomputeHeightOfContents.
-self invalidate
+].
+self invalidate
+].
 ].
 !
 foregroundColor
 "get the foreground color
 by which lines are vertically separated.
 "
 lineSpacing ~= aNumber ifTrue:[
 lineSpacing := aNumber.
-self recomputeHeightOfContents.
+realized ifTrue:[
-self invalidate
+self recomputeHeightOfContents.
+self invalidate
+]
 ]
 !
 viewBackground:aColor
 "set the background color
 lineChangedAt:aLnNr with:arg
 "line changed at position; check whether line height changed"
 |cache
 oldHeight "{ Class:SmallInteger }"
-dltHeight "{ Class:SmallInteger }" |
+deltaHeight "{ Class:SmallInteger }" |
 (arg == #icon or:[arg == #hierarchy]) ifTrue:[
 ^ self
 ].
 hasConstantHeight ifTrue:[
 self invalidateLineAt:aLnNr.
 ^ self
 ].
 oldHeight := (self yVisibleOfLine:(aLnNr + 1)) - (self yVisibleOfLine:aLnNr).
-dltHeight := (self heightOfLineAt:aLnNr) - oldHeight.
+deltaHeight := (self heightOfLineAt:aLnNr) - oldHeight.
-dltHeight == 0 ifTrue:[
+deltaHeight == 0 ifTrue:[
 self invalidateLineAt:aLnNr.
 ^ self
 ].
 cache := self startOfLinesY.
 aLnNr + 1 to:cache size do:[:i|
-cache at:i put:((cache at:i) + dltHeight)
+cache at:i put:((cache at:i) + deltaHeight)
 ].
 self invalidate.
 !
 listChangedInsert:start nItems:nLines
 newSz := startOfLinesY size + nLines.
 (newSz - 1) ~~ self size ifTrue:[
 "/
-"/ no longer synchrounous
+"/ no longer synchronized
 "/
 ^ self lostSynchronisation
 ].
 newLines := startOfLinesY copy.
 newLines addAll:(Array new:nLines) beforeIndex:start + 1.
 ].
 super update:what with:aPara from:chgObj
 !
-updateFromList:what with:aPara
+updateFromList:what with:aParameter
-"called if the list changed
+"called if the list changed"
-"
 |arg1 arg2|
-aPara isCollection ifFalse:[
+aParameter isCollection ifFalse:[
-what == #at:     ifTrue:[self lineChangedAt:aPara        with:nil.   ^ self].
+what == #at:     ifTrue:[self lineChangedAt:aParameter        with:nil.   ^ self].
-what == #insert: ifTrue:[self listChangedInsert:aPara  nItems:1.     ^ self].
+what == #insert: ifTrue:[self listChangedInsert:aParameter  nItems:1.     ^ self].
-what == #remove: ifTrue:[self listChangedRemove:aPara toIndex:aPara. ^ self].
+what == #remove: ifTrue:[self listChangedRemove:aParameter toIndex:aParameter. ^ self].
-^ self.
+self halt.
-].
+self list:(self list).  "/ reload list
+^ self.
-arg1 := aPara at:1.
+].
-arg2 := aPara at:2.
+arg1 := aParameter at:1.
+arg2 := aParameter at:2.
 (arg1 == 1 and:[arg2 == self size]) ifTrue:[
 self list:(self list).  "/ reload list
 ^ self
 ].
 what == #at:               ifTrue:[self lineChangedAt:arg1        with:arg2. ^ self].
 what == #insertCollection: ifTrue:[self listChangedInsert:arg1  nItems:arg2. ^ self].
 what == #removeFrom:       ifTrue:[self listChangedRemove:arg1 toIndex:arg2. ^ self].
 what == #replace: ifTrue:[
 arg1 to:arg2 do:[:i|self lineChangedAt:i with:nil].
 ^ self
 ].
+self halt.
+self list:(self list).  "/ reload list
 ! !
 !ListModelView methodsFor:'drawing'!
 drawElementsFrom:start to:stop x:x y:y w:w
 "
 |start stop yAbs yStart|
 shown ifFalse:[^ self].
-(self startOfLinesY size == 1 and:[self size > 1]) ifTrue:[
+(self startOfLinesY size) == (self size + 1) ifFalse:[
 "oops, recompute the height of the contents (the first time after creation).
 "
 self recomputeHeightOfContents.
 self startOfLinesY size > 1 ifTrue:[
 DefaultBackgroundColor notNil ifTrue:[
 viewBackground := DefaultBackgroundColor
 ].
 lineSpacing   := 0.
 textStartLeft := 2.
+textStartTop  := 2.
 fgColor       := DefaultForegroundColor.
 bgColor       := viewBackground.
 startOfLinesY := OrderedCollection new.
-startOfLinesY add:(2 + margin). "/ top inset of first line
+startOfLinesY add:(textStartTop + margin). "/ top inset of first line
 DefaultShadowColor notNil ifTrue:[
 shadowColor := DefaultShadowColor
 ].
 !
 mapped
 "recompute list
 "
-shown ifFalse:[
+"/ shown ifFalse:[
 self recomputeHeightOfContents.
 self contentsChanged.
-].
+"/ ].
 renderer mapped.
 super mapped
 !
 recreate
 ^ self sensor hasDamageFor:self
 !
 startOfLinesY
-"returns a sequencable list which keeps all the absolute Y-start positions
+"returns a collection of absolute Y-positions per line.
-for each line into the list. The first entry is the top Y inset.
+The first entry is the top Y inset.
-"
+The size of the list is one more than the lists size,
+providing the Y-position of the line below the contents as its last entry."
 ^ startOfLinesY
 !
 xAbsoluteOfItem:anItem
 "returns the absolute x of the labeled text
 (y := cash at:aLineNr ifAbsent:nil) notNil ifTrue:[
 ^ y
 ].
 "/ recompute a y position
-y1 := cash at:1 ifAbsent:2.
+y1 := cash at:1 ifAbsent:textStartTop.
-y2 := cash at:2 ifAbsent:10.
+y2 := cash at:2 ifAbsent:(textStartTop + 16).
 ^ aLineNr * (y2 - y1) + y1
 !
 yVisibleOfLine:aLineNr
 "given a lineNr, return y-coordinate in view
 "
 !
 yVisibleToLineNr:yVisible
-"returns the line number assigned to a physical y or nil if out of list
+"returns the line number for a given physical y coordinate
-"
+or nil if beyond of list.
-|cash
+"
+|cache
 yAbs       "{ Class: SmallInteger}"
 size       "{ Class: SmallInteger}"
 ictr       "{ Class: SmallInteger}"
 yRun       "{ Class: SmallInteger}"
 |
-cash := self startOfLinesY.
-(size := cash size) < 2 ifTrue:[^ nil].   "/ empty list
 yAbs := yVisible + viewOrigin y.
-yRun := cash at:size.
+cache := self startOfLinesY.
+(size := cache size) < 2 ifTrue:[
+"/ empty list
+(yAbs between:textStartTop and:textStartTop+16) ifTrue:[^ 1].
+^ nil
+].
+yRun := cache at:size.
 yAbs >= yRun ifTrue:[
 yAbs == yRun ifTrue:[ ^ size - 1].
 ^ nil   "/ out of list
 ].
 constantHeight notNil ifTrue:[
-yAbs := yAbs - (cash at:1).
+yAbs := yAbs - (cache at:1).
 yAbs < constantHeight ifTrue:[ ^ 1 ].
 ^ yAbs // constantHeight + 1
 ].
-ictr := yAbs // (cash at:2).
+ictr := yAbs // (cache at:2).
 ictr < 1 ifTrue:[ ictr := 1 ]
 ifFalse:[ ictr := ictr min:size ].
-yRun := cash at:ictr.
+yRun := cache at:ictr.
 yRun > yAbs ifTrue:[
 [(ictr := ictr - 1) > 0 ] whileTrue:[
-yRun := cash at:ictr.
+yRun := cache at:ictr.
 yRun <= yAbs ifTrue:[ ^ ictr ].
 ].
 ^ 1
 ].
 [ yRun ~~ yAbs ] whileTrue:[
 ictr := ictr + 1.
-yRun := cash at:ictr.
+yRun := cache at:ictr.
 yRun > yAbs ifTrue:[ ^ ictr - 1 ].
 ].
 ^ ictr
 !
 recomputeHeightOfContents
 "recompute all the y positions
 "
 |newList
 yAbs "{ Class: SmallInteger }"
-lnHg "{ Class: SmallInteger }"
+size "{ Class: SmallInteger }"|
-size "{ Class: SmallInteger }"
-|
+yAbs    := (textStartTop + margin).   "/ top inset of first line
-yAbs    := startOfLinesY at:1.   "/ top inset of first line
 size    := self size.
 newList := OrderedCollection new:(size + 1).
 newList add:yAbs.
-size == 0 ifTrue:[
+size ~~ 0 ifTrue:[
-startOfLinesY := newList.
+hasConstantHeight ifTrue:[
-^ self
+constantHeight isNil ifTrue:[ constantHeight := self heightOfAnyNonNilItem ].
 ].
-hasConstantHeight ifTrue:[
-constantHeight notNil ifTrue:[ lnHg := constantHeight ]
-ifFalse:[ lnHg := self heightOfLineAt:1 ].
 1 to:size do:[:anIndex|
-newList add:(yAbs := yAbs + lnHg)
+yAbs := yAbs + (constantHeight notNil
-].
+ifTrue:[constantHeight]
-startOfLinesY := newList.
+ifFalse:[self realHeightOfLineAt:anIndex]).
-^ self
+newList add:yAbs
 ].
-1 to:size do:[:anIndex|
-lnHg := self heightOfLineAt:anIndex.
-newList add:(yAbs := yAbs + lnHg)
 ].
 startOfLinesY := newList.
 ! !
 !ListModelView methodsFor:'scroller interface'!
 getWidthOfContents
 ^ widthOfContents
 !
+heightOfAnyNonNilItem
+"returns the height of a line at an index (including lineSpacing...)"
+|item|
+item := list detect:[:i | i notNil] ifNone:nil.
+item isNil ifTrue:[ ^ 16 "arbitrary" ].
+^ self lineHeightFor:item.
+!
 heightOfContents
-"return the height of the contents in pixels
+"return the height of the contents in pixels"
-"
 ^ self startOfLinesY last ? 0
 !
 heightOfLineAt:aLineNr
-"returns the total height for a line at an index( including lineSpacing ... )
+"returns the height of a line at an index (including lineSpacing...)"
-"
-|item|
 hasConstantHeight ifTrue:[
-constantHeight notNil ifTrue:[ ^ constantHeight ].
+constantHeight isNil ifTrue:[
-item := self at:1 ifAbsent:nil.
+constantHeight := self heightOfAnyNonNilItem.
+].
-item notNil ifTrue:[
+^ constantHeight
-constantHeight := self lineHeightFor:item.
+].
-^ constantHeight
+^ self realHeightOfLineAt:aLineNr
-]
-] ifFalse:[
-item := self at:aLineNr ifAbsent:nil.
-item notNil ifTrue:[
-^ self lineHeightFor:item
-]
-].
-^ 4
 !
 innerHeight
 "returns the inner height of the contents shown
 "
 "returns the maximum possible y of the view origin
 "
 ^ (self heightOfContents - self innerHeight) max:0
+!
+realHeightOfLineAt:aLineNr
+"returns the real (uncached) height of a line at an index"
+|item|
+item := self at:aLineNr ifAbsent:nil.
+item notNil ifTrue:[
+^ self lineHeightFor:item
+].
+^ font height "arbitrary"
 !
 setWidthOfContents: aWidth
 widthOfContents := aWidth.
 !
 ! !
 !ListModelView::Renderer methodsFor:'change & update'!
 listWillChange
-"called before the list changed, clear cashes ect.
+"called before the list changed, clear caches etc.
 here nothing is done
 "
 !
 withinUpdateFromListDo:aBlock
 ! !
 !ListModelView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.96 2004-09-20 10:33:52 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.97 2005-10-06 10:58:18 cg Exp $'
 ! !
 ListModelView initialize!

changeset 2852	c5651fcf9770
parent 2745	5986c83276b1
child 2866	01d609cfb3d9