hg/stx-libwidg2: comparison ListModelView.st

equal deleted inserted replaced

-:03a3787770ed
+:8858b3571313
 View subclass:#ListModelView
 	instanceVariableNames:'list listHolder textStartLeft textStartTop viewOrigin enabled
 		fgColor bgColor lineSpacing widthOfContents computeWidthInRange
 		startOfLinesY autoScroll autoScrollBlock scrollWhenUpdating
-		hasConstantHeight constantHeight previousExtent renderer
+		hasConstantHeight constantHeight previousExtent listRenderer
 		cachedPreferredExtent'
 	classVariableNames:'DefaultForegroundColor DefaultBackgroundColor DefaultShadowColor
 		DefaultLightColor StopRedrawSignal'
 	poolDictionaries:''
 	category:'Views-Lists'
 This class can only passively display collections of elements.
 The class doesn't keep its own list, it works directly on
 the list ( List or HierarchicalList ).
 ATTENTION (warning by cg):
-in contrast to its inappropriate name, this class COMPLETELY ignores the model
+	in contrast to its inappropriate name, this class COMPLETELY ignores the model
-instance variable - all is through the list/listHolder.
+	instance variable - all is through the list/listHolder.
 Each list item is obligated to provide 3 services:
-- heightOn:aGC
+	- heightOn:aGC
-- widthOn:aGC
+	- widthOn:aGC
-- displayOn:aGC x:x y:y
+	- displayOn:aGC x:x y:y
 [Instance variables:]
-list                   <List-Model>     List or HierarchicalList ...
+	list                   <List-Model>     List or HierarchicalList ...
-listHolder             <Model>          Model, which keeps a List
+	listHolder             <Model>          Model, which keeps a List
-textStartLeft          <Number>         left inset of text
+	textStartLeft          <Number>         left inset of text
-viewOrigin             <Point>          the current origin
+	viewOrigin             <Point>          the current origin
-enabled                <Boolean>        widget is enabled/disabeled
+	enabled                <Boolean>        widget is enabled/disabeled
-fgColor                <Color>          color to draw characters
+	fgColor                <Color>          color to draw characters
-bgColor                <Color>          the background
+	bgColor                <Color>          the background
-lineSpacing            <Number>         pixels between lines
+	lineSpacing            <Number>         pixels between lines
-widthOfContents        <Number>         cached width of widest line
+	widthOfContents        <Number>         cached width of widest line
-computeWidthInRange    <Point>          used for recompute width of contents
+	computeWidthInRange    <Point>          used for recompute width of contents
-startOfLinesY          <Collection>     keeps all the absolute Y-start positions
+	startOfLinesY          <Collection>     keeps all the absolute Y-start positions
-for each line in the list. The first
+						for each line in the list. The first
-entry into the list is the top Y inset.
+						entry into the list is the top Y inset.
-supportsDisplayInRange <Boolean>        set to true if the list elements
+	supportsDisplayInRange <Boolean>        set to true if the list elements
-supports the service:
+						supports the service:
-#displayOn:x:y:h:
+						    #displayOn:x:y:h:
-hasConstantHeight      <Boolean>        true, than each line has the same height
+	hasConstantHeight      <Boolean>        true, than each line has the same height
-constantHeight         <SmallInteger>   hasConstantHeight is turned on, this
+	constantHeight         <SmallInteger>   hasConstantHeight is turned on, this
-is the used line height
+						is the used line height
 [author:]
-Claus Atzkern
+	Claus Atzkern
 [see also:]
-SelectionInListModelView
+	SelectionInListModelView
-HierarchicalListView
+	HierarchicalListView
-List
+	List
-HierarchicalList
+	HierarchicalList
 "
 !
 examples
 "
 list:aList
 "set the list of items
 "
 |negatedOrg|
-renderer listWillChange.
+listRenderer listWillChange.
 list ~~ aList ifTrue:[
-list removeDependent:self.
+	list removeDependent:self.
-list := aList.
+	list := aList.
-list isNil ifTrue:[list := self newDefaultList ].
+	list isNil ifTrue:[list := self newDefaultList ].
-list addDependent:self
+	list addDependent:self
 ].
 "/    preferredExtent := nil.
 cachedPreferredExtent := nil.
 widthOfContents := nil.
 realized ifTrue:[
-self recomputeHeightOfContents.
+	self recomputeHeightOfContents.
-scrollWhenUpdating == #beginOfText ifTrue:[
+	scrollWhenUpdating == #beginOfText ifTrue:[
-viewOrigin = (0@0) ifFalse:[
+	    viewOrigin = (0@0) ifFalse:[
-self originWillChange.
+		self originWillChange.
-negatedOrg := viewOrigin negated.
+		negatedOrg := viewOrigin negated.
-viewOrigin := (0@0).
+		viewOrigin := (0@0).
-self originChanged:negatedOrg.
+		self originChanged:negatedOrg.
-].
+	    ].
-] ifFalse:[
+	] ifFalse:[
-scrollWhenUpdating == #endOfText ifTrue:[
+	    scrollWhenUpdating == #endOfText ifTrue:[
-self scrollTo:(0 @ self heightOfContents - self innerHeight) redraw:false
+		self scrollTo:(0 @ self heightOfContents - self innerHeight) redraw:false
-]
+	    ]
-].
+	].
-self invalidate.
+	self invalidate.
 ].
 self contentsChanged
 !
+listRenderer
+"returns the used listrenderer
+"
+^ listRenderer
+!
 renderer
-"returns the used renderer
+self obsoleteMethodWarning:'naming conflict renderer vs. listRenderer'.
-"
+^ self listRenderer
-^ renderer
+!
-!
+listRenderer:aRendererOrRendererClass
-renderer:aRenderer
+"change the used listRenderer
-"change the used renderer
+"
-"
+aRendererOrRendererClass isNil ifTrue:[^ self].
-aRenderer isNil ifTrue:[^ self].
+listRenderer == aRendererOrRendererClass ifTrue:[^ self].
-renderer == aRenderer ifTrue:[^ self].
+listRenderer notNil ifTrue:[listRenderer release].
-renderer notNil ifTrue:[renderer release].
+aRendererOrRendererClass isBehavior ifTrue:[
-renderer := aRenderer.
+	listRenderer := aRendererOrRendererClass basicNew initialize.
-renderer isBehavior ifTrue:[
+] ifFalse:[
-renderer := renderer basicNew initialize.
+	listRenderer := aRendererOrRendererClass.
 ].
-renderer forView:self.
+listRenderer forView:self.
+!
+renderer:aTableRenderer
+self obsoleteMethodWarning:'naming conflict renderer vs. listRenderer'.
+self listRenderer:aTableRenderer
 !
 setupTableRenderer
-"under test - creates a renderer with columns based on a DataSetColumnSpec
+"creates a renderer with columns based on a DataSetColumnSpec
 answer the new renderer"
-self renderer:TableRenderer.
+self listRenderer:TableRenderer.
-^ renderer
+^ listRenderer
 ! !
 !ListModelView methodsFor:'accessing-behavior'!
 autoScroll
 "user configured; true if each line has the same lineHeight.
 Optimizes scrolling and redraw.
 "
 aBool == hasConstantHeight ifTrue:[
-^ self
+	^ self
 ].
 constantHeight    := nil.
 hasConstantHeight := aBool.
 self lostSynchronisation.
 !
 scrollWhenUpdating:aSymbolOrNil
 "define how to scroll, when I get a new text
 (via the model or the #contents/#list)
 Allowed arguments are:
 	#keep / nil     -> no change
 	#endOfText      -> scroll to the end
 	#beginOfText    -> scroll to the top
 "
 ^ list at:anIndex
 !
 at:anIndex ifAbsent:exceptionBlock
 "return the list element at an index if valid.
 If the index is invalid, return the result of evaluating
 the exceptionblock.
 "
 ^ list at:anIndex ifAbsent:exceptionBlock
 !
 "set a new font
 "
 |oldWidth oldHeight|
 (aFont isNil or:[aFont = font]) ifFalse:[
-oldWidth  := font width.
+	oldWidth  := font width.
-oldHeight := font height.
+	oldHeight := font height.
-super font:aFont.
+	super font:aFont.
-(font widthOn:device) ~~ oldWidth ifTrue:[       "/ force a recomputation
+	(font widthOn:device) ~~ oldWidth ifTrue:[       "/ force a recomputation
 "/            preferredExtent := nil.
-cachedPreferredExtent := nil.
+	    cachedPreferredExtent := nil.
-widthOfContents := nil.
+	    widthOfContents := nil.
-].
+	].
-realized ifTrue:[
+	realized ifTrue:[
-oldHeight ~~ (font heightOn:device) ifTrue:[
+	    oldHeight ~~ (font heightOn:device) ifTrue:[
-self recomputeHeightOfContents.
+		self recomputeHeightOfContents.
-self contentsChanged.
+		self contentsChanged.
-].
+	    ].
-self invalidate
+	    self invalidate
-].
+	].
 ].
 !
 foregroundColor
 "get the foreground color
 lineSpacing:aNumber
 "set the lineSpacing - thats an additional number of pixels,
 by which lines are vertically separated.
 "
 lineSpacing ~= aNumber ifTrue:[
-lineSpacing := aNumber.
+	lineSpacing := aNumber.
-realized ifTrue:[
+	realized ifTrue:[
-self recomputeHeightOfContents.
+	    self recomputeHeightOfContents.
-self invalidate
+	    self invalidate
-].
+	].
-self contentsChanged.
+	self contentsChanged.
 ]
 !
 viewBackground:aColor
 "set the background color
 "
 (aColor notNil and:[bgColor ~~ aColor]) ifTrue:[
-bgColor := aColor.
+	bgColor := aColor.
-super viewBackground:bgColor.
+	super viewBackground:bgColor.
-self realized ifTrue:[
+	self realized ifTrue:[
-bgColor := bgColor onDevice:device.
+	    bgColor := bgColor onDevice:device.
-self invalidate
+	    self invalidate
-].
+	].
 ].
 ! !
 !ListModelView methodsFor:'accessing-mvc'!
 |cache
 oldHeight "{ Class:SmallInteger }"
 deltaHeight "{ Class:SmallInteger }" |
 (arg == #icon or:[arg == #hierarchy]) ifTrue:[
-^ self
+	^ self
 ].
 hasConstantHeight ifTrue:[
-self invalidateLineAt:aLnNr.
+	self invalidateLineAt:aLnNr.
-^ self
+	^ self
 ].
 oldHeight := (self yVisibleOfLine:(aLnNr + 1)) - (self yVisibleOfLine:aLnNr).
 deltaHeight := (self heightOfLineAt:aLnNr) - oldHeight.
 deltaHeight == 0 ifTrue:[
-self invalidateLineAt:aLnNr.
+	self invalidateLineAt:aLnNr.
-^ self
+	^ self
 ].
 cache := self startOfLinesY.
 aLnNr + 1 to:cache size do:[:i|
-cache at:i put:((cache at:i) + deltaHeight)
+	cache at:i put:((cache at:i) + deltaHeight)
 ].
 self contentsChanged.
 self invalidate.
 !
 listChangedInsert:start nItems:nLines
 shown ifFalse:[^ self].
 newSz := startOfLinesY size + nLines.
 (newSz - 1) ~~ self size ifTrue:[
-"/
+	"/
-"/ no longer synchronized
+	"/ no longer synchronized
-"/
+	"/
-self lostSynchronisation.
+	self lostSynchronisation.
-^ self
+	^ self
 ].
 newLines := startOfLinesY. "/ copy.
 newLines addAll:(Array new:nLines) beforeIndex:start + 1.
 absY0 := newLines at:start.
 absY1 := absY0.
 run   := start.
 nLines timesRepeat:[
-absY1 := absY1 + (self heightOfLineAt:run).
+	absY1 := absY1 + (self heightOfLineAt:run).
-run   := run + 1.
+	run   := run + 1.
-newLines at:run put:absY1.
+	newLines at:run put:absY1.
 ].
 dltY := absY1 - absY0.
 run + 1 to:newSz do:[:i||v|
-newLines at:i put:((newLines at:i) + dltY)
+	newLines at:i put:((newLines at:i) + dltY)
 ].
 startOfLinesY := newLines.
 orgY  := viewOrigin y.
 absY1 := absY0 + dltY.
 visY0 := absY0 - orgY.
 visY1 := absY1 - orgY.
 maxHg := height - margin.
 absY0 < orgY ifTrue:[
-self originWillChange.
+	self originWillChange.
-viewOrigin y:(dltY + orgY).
+	viewOrigin y:(dltY + orgY).
-self originChanged:(0 @ dltY).
+	self originChanged:(0 @ dltY).
 ].
 (visY0 >= maxHg or:[visY1 <= margin]) ifTrue:[
-self contentsChanged.
+	self contentsChanged.
-^ self
+	^ self
 ].
 visY0 := visY0 max:margin.
 visY1 := visY1 min:maxHg.
 self hasDamage ifTrue:[
-self invalidate:(Rectangle left:0
+	self invalidate:(Rectangle left:0
-top:visY0
+				    top:visY0
-width:width
+				  width:width
-height:height - visY0).
+				 height:height - visY0).
-self contentsChanged.
+	self contentsChanged.
-^ self
+	^ self
 ].
 (start == self size or:[(cpyHg := maxHg - visY1) < 20]) ifTrue:[
-visY1 := maxHg
+	visY1 := maxHg
 ] ifFalse:[
-self catchExpose.
+	self catchExpose.
-self copyFrom:self x:0 y:visY0
+	self copyFrom:self x:0 y:visY0
-toX:0 y:visY1
+			 toX:0 y:visY1
-width:width height:cpyHg async:true.
+		       width:width height:cpyHg async:true.
-self waitForExpose
+	self waitForExpose
 ].
 self invalidateX:margin
-y:visY0
+		   y:visY0
-width:width - margin - margin
+	       width:width - margin - margin
-height:(visY1 - visY0).
+	      height:(visY1 - visY0).
 self contentsChanged.
 !
 listChangedRemove:aStart toIndex:aStop
 |
 stop  := aStop.
 start := aStart.
 (size := stop - start + 1) == 0 ifTrue:[
-^ self
+	^ self
 ].
 self listSizeChanged:start nLines:(size negated).
 shown ifFalse:[^ self].
 newSz := startOfLinesY size - size.
 (newSz - 1) ~~ self size ifTrue:[
-"/
+	"/
-"/ no longer synchrounous
+	"/ no longer synchrounous
-"/
+	"/
-^ self lostSynchronisation
+	^ self lostSynchronisation
 ].
 absY0 := self yAbsoluteOfLine:start.
 absY1 := self yAbsoluteOfLine:stop + 1.
 dltY  := absY1 - absY0.
 newLines := startOfLinesY. "/ copy.
 newLines removeFromIndex:(start + 1) toIndex:(stop + 1).
 (start + 1) to:newSz do:[:i|
-absY0 := newLines at:i.
+	absY0 := newLines at:i.
-newLines at:i put:(absY0 - dltY).
+	newLines at:i put:(absY0 - dltY).
 ].
 startOfLinesY := newLines.
 orgY  := viewOrigin y.
 orgX  := viewOrigin x.
 visY0 := absY0 - orgY.
 visY1 := absY1 - orgY.
 maxHg := height - margin.
 (self size == 0 or:[(orgY ~~ 0 and:[self maxViewOriginY == 0])]) ifTrue:[
-(orgX ~~ 0 or:[orgY ~~ 0]) ifTrue:[
+	(orgX ~~ 0 or:[orgY ~~ 0]) ifTrue:[
-self originWillChange.
+	    self originWillChange.
-viewOrigin := 0@0.
+	    viewOrigin := 0@0.
-self originChanged:((orgX @ orgY) negated).
+	    self originChanged:((orgX @ orgY) negated).
-].
+	].
-self invalidate.
+	self invalidate.
-^ self contentsChanged
+	^ self contentsChanged
 ].
 visY0 < margin ifTrue:[
-noRedraw := visY1 <= margin.
+	noRedraw := visY1 <= margin.
-noRedraw ifTrue:[dltY := dltY negated] ifFalse:[dltY := visY0].
+	noRedraw ifTrue:[dltY := dltY negated] ifFalse:[dltY := visY0].
-self originWillChange.
+	self originWillChange.
-viewOrigin y:(dltY + orgY).
+	viewOrigin y:(dltY + orgY).
-self originChanged:(0 @ dltY).
+	self originChanged:(0 @ dltY).
 ] ifFalse:[
-noRedraw := visY0 >= maxHg
+	noRedraw := visY0 >= maxHg
 ].
 visY0 := visY0 max:margin.
 self hasDamage ifTrue:[
-self invalidate:(Rectangle left:0
+	self invalidate:(Rectangle left:0
-top:visY0
+				    top:visY0
-width:width
+				  width:width
-height:height - visY0).
+				 height:height - visY0).
-noRedraw := true
+	noRedraw := true
 ].
 noRedraw ifFalse:[
-cpyHg := maxHg - visY1.
+	cpyHg := maxHg - visY1.
-cpyHg > 20 ifTrue:[
+	cpyHg > 20 ifTrue:[
-self catchExpose.
+	    self catchExpose.
-self copyFrom:self x:0 y:visY1 toX:0 y:visY0
+	    self copyFrom:self x:0 y:visY1 toX:0 y:visY0
-width:width height:cpyHg async:true.
+		    width:width height:cpyHg async:true.
-self waitForExpose.
+	    self waitForExpose.
-visY0 := visY0 + cpyHg.
+	    visY0 := visY0 + cpyHg.
-].
+	].
-self invalidateX:margin
+	self invalidateX:margin
-y:visY0
+		       y:visY0
-width:width - margin - margin
+		   width:width - margin - margin
-height:(maxHg - visY0).
+		  height:(maxHg - visY0).
 ].
 self contentsChanged.
 !
 update:what with:aPara from:chgObj
 "catch and handle any notification raised from the list model
 or list holder"
 chgObj == self listHolder ifTrue:[
-self list:chgObj value.
+	self list:chgObj value.
-^ self.
+	^ self.
 ].
 chgObj == self list ifTrue:[
-renderer withinUpdateFromListDo:[
+	listRenderer withinUpdateFromListDo:[
-self updateFromList:what with:aPara.
+	    self updateFromList:what with:aPara.
-].
+	].
-^ self.
+	^ self.
 ].
 super update:what with:aPara from:chgObj
 !
 "called if the list changed"
 |arg1 arg2|
 aParameter isCollection ifFalse:[
-what == #at:     ifTrue:[self lineChangedAt:aParameter        with:nil.   ^ self].
+	what == #at:     ifTrue:[self lineChangedAt:aParameter        with:nil.   ^ self].
-what == #insert: ifTrue:[self listChangedInsert:aParameter  nItems:1.     ^ self].
+	what == #insert: ifTrue:[self listChangedInsert:aParameter  nItems:1.     ^ self].
-what == #remove: ifTrue:[self listChangedRemove:aParameter toIndex:aParameter. ^ self].
+	what == #remove: ifTrue:[self listChangedRemove:aParameter toIndex:aParameter. ^ self].
-self list:(self list).  "/ reload list
+	self list:(self list).  "/ reload list
-^ self.
+	^ self.
 ].
 arg1 := aParameter at:1.
 arg2 := aParameter at:2.
 (arg1 == 1 and:[arg2 == self size]) ifTrue:[
-self list:(self list).  "/ reload list
+	self list:(self list).  "/ reload list
-^ self
+	^ 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].
+	arg1 to:arg2 do:[:i|self lineChangedAt:i with:nil].
-^ self
+	^ self
 ].
 self halt:'oops - general change'.
 self list:(self list).  "/ reload list
 ! !
 x0 := textStartLeft - viewOrigin x.
 y1 := y.
 start to:stop do:[:i|
-item := self at:i ifAbsent:self.        "/ list changed during draw
+	item := self at:i ifAbsent:self.        "/ list changed during draw
-item == self ifTrue:[^ self].
+	item == self ifTrue:[^ self].
-y0 := y1.
+	y0 := y1.
-y1 := self yVisibleOfLine:(i + 1).
+	y1 := self yVisibleOfLine:(i + 1).
-item notNil ifTrue:[
+	item notNil ifTrue:[
-renderer display:item atX:x0 y:y0 lineHeight:(y1 - y0).
+	    listRenderer display:item atX:x0 y:y0 lineHeight:(y1 - y0).
-]
+	]
 ]
 !
 drawFrom:start to:stop x:xLft y:yTop w:aWidth
 "draw lines from start to stop. Test whether a new clip
 must be setup.
 "
 |maxX w|
-maxX := renderer maxItemWidthOrNil.
+maxX := listRenderer maxItemWidthOrNil.
 w := aWidth.
 maxX notNil ifTrue:[ |clip|
-maxX := maxX - viewOrigin x.
+	maxX := maxX - viewOrigin x.
-maxX > xLft ifFalse:[^ self.].
+	maxX > xLft ifFalse:[^ self.].
-w := maxX - xLft min:aWidth.
+	w := maxX - xLft min:aWidth.
-(clip := self clipRect copy) notNil ifTrue:[
+	(clip := self clipRect copy) notNil ifTrue:[
-clip width:w
+	    clip width:w
-] ifFalse:[
+	] ifFalse:[
-clip := Rectangle left:xLft top:yTop width:w height:(height - yTop - margin).
+	    clip := Rectangle left:xLft top:yTop width:w height:(height - yTop - margin).
-].
+	].
-self clippingRectangle:clip.
+	self clippingRectangle:clip.
 ].
 self drawElementsFrom:start to:stop x:xLft y:yTop w:w.
 !
 invalidateLineAt:aLineNr
 x0 "{ Class:SmallInteger }"
 xR "{ Class:SmallInteger }"
 |
 (shown and:[aLineNr notNil and:[aLineNr > 0]]) ifFalse:[
-^ self
+	^ self
 ].
 xR := width - margin.
 x0 := x max:margin.
 x0 < xR ifFalse:[ ^ self].
 yB := height - margin.
 y0 := (self yVisibleOfLine:aLineNr) max:margin.
 y0 < yB ifTrue:[
-y1 := (self yVisibleOfLine:(aLineNr + 1)) min:yB.
+	y1 := (self yVisibleOfLine:(aLineNr + 1)) min:yB.
-y1 > y0 ifTrue:[
+	y1 > y0 ifTrue:[
-self invalidateX:x0 y:y0 width:(xR - x0) height:(y1 - y0) repairNow:false.
+	    self invalidateX:x0 y:y0 width:(xR - x0) height:(y1 - y0) repairNow:false.
-]
+	]
 ].
 !
 redraw
 "redraw complete view
 !
 redrawX:x y:y width:w height:h
 "redraw part of myself immediately, given logical coordinates
 "
 |start stop yAbs yStart|
 shown ifFalse:[^ self].
 (self startOfLinesY size) == (self size + 1) ifFalse:[
-"oops, recompute the height of the contents (the first time after creation).
+	"oops, recompute the height of the contents (the first time after creation).
-"
+	"
-self recomputeHeightOfContents.
+	self recomputeHeightOfContents.
-self startOfLinesY size > 1 ifTrue:[
+	self startOfLinesY size > 1 ifTrue:[
-"oops, the contents height changed
+	    "oops, the contents height changed
-"
+	    "
-self invalidate.
+	    self invalidate.
-self contentsChanged.
+	    self contentsChanged.
-^ self
+	    ^ self
-].
+	].
 ].
 "/    widthOfContents isNil ifTrue:[
 "/        self preferredExtent
 "/    ].
 yStart := y.
 start  := self yVisibleToLineNr:y.
 start notNil ifTrue:[
-yAbs := y + h.
+	yAbs := y + h.
-stop := self yVisibleToLineNr:yAbs.
+	stop := self yVisibleToLineNr:yAbs.
-stop isNil ifTrue:[
+	stop isNil ifTrue:[
-stop := self size.
+	    stop := self size.
-] ifFalse:[ |y0|
+	] ifFalse:[ |y0|
-y0 := self startOfLinesY at:stop ifAbsent:nil.
+	    y0 := self startOfLinesY at:stop ifAbsent:nil.
-y0 isNil ifTrue:[^ self].   "/ oops, lines differ (will be changed)
+	    y0 isNil ifTrue:[^ self].   "/ oops, lines differ (will be changed)
-yAbs == y0 ifTrue:[
+	    yAbs == y0 ifTrue:[
-stop := (stop - 1) max:start
+		stop := (stop - 1) max:start
-].
+	    ].
-].
+	].
-start > stop ifTrue:[
+	start > stop ifTrue:[
-start := stop := nil.
+	    start := stop := nil.
-] ifFalse:[
+	] ifFalse:[
-(renderer validateDrawableItemsFrom:start to:stop) ifFalse:[
+	    (listRenderer validateDrawableItemsFrom:start to:stop) ifFalse:[
-self invalidate.
+		self invalidate.
-^ self.
+		^ self.
-].
+	    ].
-yStart := self yVisibleOfLine:start.
+	    yStart := self yVisibleOfLine:start.
-].
+	].
 ].
 self paint:bgColor.
 self fillRectangleX:x y:y width:w height:h.
 StopRedrawSignal handle:[:ex|
-"/ an item changed its dimension during drawing, draw is aborted
+	"/ an item changed its dimension during drawing, draw is aborted
-self invalidate
+	self invalidate
 ] do:[
-start notNil ifTrue:[
+	start notNil ifTrue:[
-self drawFrom:start to:stop x:x y:yStart w:w.
+	    self drawFrom:start to:stop x:x y:yStart w:w.
-].
+	].
-renderer postRedrawX:x y:yStart w:w from:start to:stop.
+	listRenderer postRedrawX:x y:yStart w:w from:start to:stop.
 ].
 ! !
 !ListModelView methodsFor:'enumerating'!
 lineNr := self yVisibleToLineNr:1.
 lineNr isNil ifTrue:[ ^ self ].
 [   item := list at:lineNr ifAbsent:[ ^ self ].
-aTwoArgBlock value:lineNr value:item.
+	aTwoArgBlock value:lineNr value:item.
-lineNr := lineNr + 1.
+	lineNr := lineNr + 1.
-(self yVisibleOfLine:lineNr) < height
+	(self yVisibleOfLine:lineNr) < height
 ] whileTrue.
 ! !
 !ListModelView methodsFor:'event handling'!
 keyPress:aKey x:x y:y
 "a key was pressed - handle page-keys here"
 <resource: #keyboard( #PreviousPage #NextPage  #HalfPageUp #HalfPageDown
-#BeginOfText  #EndOfText #ScrollUp   #ScrollDown
+			  #BeginOfText  #EndOfText #ScrollUp   #ScrollDown
-)>
+			)>
 |n|
 self size ~~ 0 ifTrue:[
-(aKey == #PreviousPage) ifTrue:[^ self pageUp].
+	(aKey == #PreviousPage) ifTrue:[^ self pageUp].
-(aKey == #NextPage)     ifTrue:[^ self pageDown].
+	(aKey == #NextPage)     ifTrue:[^ self pageDown].
-(aKey == #HalfPageUp)   ifTrue:[^ self halfPageUp].
+	(aKey == #HalfPageUp)   ifTrue:[^ self halfPageUp].
-(aKey == #HalfPageDown) ifTrue:[^ self halfPageDown].
+	(aKey == #HalfPageDown) ifTrue:[^ self halfPageDown].
-(aKey == #BeginOfText)  ifTrue:[^ self scrollToTop].
+	(aKey == #BeginOfText)  ifTrue:[^ self scrollToTop].
-(aKey == #EndOfText)    ifTrue:[^ self scrollToBottom].
+	(aKey == #EndOfText)    ifTrue:[^ self scrollToBottom].
-(aKey == #ScrollUp or:[aKey == #ScrollDown]) ifTrue:[
+	(aKey == #ScrollUp or:[aKey == #ScrollDown]) ifTrue:[
-n := 1 + (self sensor compressKeyPressEventsWithKey:aKey).
+	    n := 1 + (self sensor compressKeyPressEventsWithKey:aKey).
-n := n * self verticalScrollStep.
+	    n := n * self verticalScrollStep.
-aKey == #ScrollUp ifTrue:[self scrollUp:n]
+	    aKey == #ScrollUp ifTrue:[self scrollUp:n]
-ifFalse:[self scrollDown:n].
+			     ifFalse:[self scrollDown:n].
-^ self
+	    ^ self
-].
+	].
 ].
 super keyPress:aKey x:x y:y
 !
 sizeChanged:how
 anImage isNil ifTrue:[^ anImage].
 deviceImage := anImage onDevice:device.
 deviceImage isImage ifTrue:[
-deviceImage clearMaskedPixels.
+	deviceImage clearMaskedPixels.
 ].
 ^ deviceImage
 "/    |image|
 "/
 "/    (image := anImage) notNil ifTrue:[
 "setup viewStyle specifics
 "
 super initStyle.
 DefaultBackgroundColor notNil ifTrue:[
-viewBackground := DefaultBackgroundColor
+	viewBackground := DefaultBackgroundColor
 ].
 lineSpacing   := 0.
 textStartLeft := 2.
 textStartTop  := 2.
 fgColor       := DefaultForegroundColor.
 startOfLinesY := OrderedCollection new.
 startOfLinesY add:(textStartTop + margin). "/ top inset of first line
 DefaultShadowColor notNil ifTrue:[
-shadowColor := DefaultShadowColor
+	shadowColor := DefaultShadowColor
 ].
 DefaultLightColor notNil ifTrue:[
-lightColor := DefaultLightColor
+	lightColor := DefaultLightColor
 ].
 !
 initialize
 "setup default attributes
 enabled            := true.
 autoScroll         := true.
 scrollWhenUpdating := #beginOfText.
 hasConstantHeight  := false.
-renderer isNil ifTrue:[
+listRenderer isNil ifTrue:[
-renderer := self class defaultRenderer forView:self.
+	listRenderer := self class defaultRenderer forView:self.
 ].
 self list:(self newDefaultList).
 !
 mapped
 "
 "/ shown ifFalse:[
 "/        self recomputeHeightOfContents.
 "/        self contentsChanged.     "/ is computeEditorLayout what you want ?
 "/ ].
-renderer mapped.
+listRenderer mapped.
 super mapped
 !
 recreate
 !
 release
 "remove dependencies
 "
-renderer release.
+listRenderer release.
 self listHolder removeDependent:self.
 self list       removeDependent:self.
 super release
 ^ self sensor hasDamageFor:self
 !
 startOfLinesY
 "returns a collection of absolute Y-positions per line.
 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
 |y y2 y1 cash|
 cash := self startOfLinesY.
 (y := cash at:aLineNr ifAbsent:nil) notNil ifTrue:[
-^ y
+	^ y
 ].
 "/ recompute a y position
 y1 := cash at:1 ifAbsent:textStartTop.
 y2 := cash at:2 ifAbsent:(textStartTop + 16).
 yAbs := yVisible + viewOrigin y.
 cache := self startOfLinesY.
 (size := cache size) < 2 ifTrue:[
-"/ empty list
+	"/ empty list
-(yAbs between:textStartTop and:textStartTop+16) ifTrue:[^ 1].
+	(yAbs between:textStartTop and:textStartTop+16) ifTrue:[^ 1].
-^ nil
+	^ nil
 ].
 yCache := cache at:size ifAbsent:nil.
 yCache isNil ifTrue:[ ^ nil ].    "/ out of list
 yRun := yCache.
 yAbs >= yRun ifTrue:[
-yAbs == yRun ifTrue:[ ^ size - 1].
+	yAbs == yRun ifTrue:[ ^ size - 1].
-^ nil   "/ out of list
+	^ nil   "/ out of list
 ].
 constantHeight notNil ifTrue:[
-yAbs := yAbs - (cache at:1).
+	yAbs := yAbs - (cache at:1).
-yAbs < constantHeight ifTrue:[ ^ 1 ].
+	yAbs < constantHeight ifTrue:[ ^ 1 ].
-^ yAbs // constantHeight + 1
+	^ yAbs // constantHeight + 1
 ].
 ictr := yAbs // (cache at:2).
 ictr < 1 ifTrue:[ ictr := 1 ]
-ifFalse:[ ictr := ictr min:size ].
+	    ifFalse:[ ictr := ictr min:size ].
 yRun := cache at:ictr.
 yRun > yAbs ifTrue:[
-[(ictr := ictr - 1) > 0 ] whileTrue:[
+	[(ictr := ictr - 1) > 0 ] whileTrue:[
-yRun := cache at:ictr.
+	    yRun := cache at:ictr.
-yRun <= yAbs ifTrue:[ ^ ictr ].
+	    yRun <= yAbs ifTrue:[ ^ ictr ].
-].
+	].
-^ 1
+	^ 1
 ].
 [ yRun ~~ yAbs ] whileTrue:[
-ictr := ictr + 1.
+	ictr := ictr + 1.
-yRun := cache at:ictr.
+	yRun := cache at:ictr.
-yRun > yAbs ifTrue:[ ^ ictr - 1 ].
+	yRun > yAbs ifTrue:[ ^ ictr - 1 ].
 ].
 ^ ictr
 !
 yVisibleToRowNr:yVisible
 !
 lineHeightFor:anItem
 "returns the computed line height for an item
 "
-^ lineSpacing + (renderer heightFor:anItem)
+^ lineSpacing + (listRenderer heightFor:anItem)
 !
 listSizeChanged:anIndex nLines:noLines
 "list size changed; information is stored to recompute the
 width if required( preferredExtent, horizontal scroller ... ).
 |
 "/    preferredExtent := nil.
 cachedPreferredExtent := nil.
 widthOfContents isNil ifTrue:[      "/ recompute whole list
-^ self
+	^ self
 ].
 (noLines < 0 or:[(size := self size) <= noLines]) ifTrue:[
-widthOfContents := nil.         "/ force recompute whole list
+	widthOfContents := nil.         "/ force recompute whole list
-^ self
+	^ self
 ].
 stop  := anIndex + noLines - 1.     "/ recompute a range
 start := anIndex.
 computeWidthInRange notNil ifTrue:[
-start := computeWidthInRange y.
+	start := computeWidthInRange y.
-stop  <  start ifTrue:[stop := start min:size].
+	stop  <  start ifTrue:[stop := start min:size].
-start := (computeWidthInRange x) min:anIndex.
+	start := (computeWidthInRange x) min:anIndex.
 ].
 computeWidthInRange := start@stop
 !
 lostSynchronisation
 "called when the changes derived from the model are faster than the handling
 "
 shown ifTrue:[
-self recomputeHeightOfContents.
+	self recomputeHeightOfContents.
-self invalidate.
+	self invalidate.
-self contentsChanged
+	self contentsChanged
 ].
 !
 newDefaultList
 "creates and returns a new default list class, on default a List
 widthOfWidestLineBetween:firstLine and:lastLine
 "return the width in pixels of the widest line in a range
 "
 |item width|
-width := renderer widthOfWidestLineBetween:firstLine and:lastLine.
+width := listRenderer widthOfWidestLineBetween:firstLine and:lastLine.
 width notNil ifTrue:[^ width].
 width := textStartLeft.
 firstLine to:lastLine do:[:anIndex|
-item := self at:anIndex ifAbsent:nil.
+	item := self at:anIndex ifAbsent:nil.
-item isNil ifTrue:[^ width + textStartLeft].
+	item isNil ifTrue:[^ width + textStartLeft].
-width := (renderer widthFor:item) max:width
+	width := (listRenderer widthFor:item) max:width
 ].
 ^ width + textStartLeft
 ! !
 !ListModelView methodsFor:'queries'!
 shown ifFalse:[^ false].
 y := self yVisibleOfLine:aLineNr.
 (y between:0 and:height) ifTrue:[
-y := self yVisibleOfLine:(aLineNr + 1).
+	y := self yVisibleOfLine:(aLineNr + 1).
-y <= height ifTrue:[^ true ].
+	y <= height ifTrue:[^ true ].
 ].
 ^ false
 !
 size
 |x y|
 "/ If I have an explicit preferredExtent..
 explicitExtent notNil ifTrue:[
-^ explicitExtent
+	^ explicitExtent
 ].
 "/ If I have a cached preferredExtent value..
 preferredExtent notNil ifTrue:[
-^ preferredExtent
+	^ preferredExtent
 ].
 cachedPreferredExtent isNil ifTrue:[
-y := self heightOfContents.
+	y := self heightOfContents.
-x := self widthOfContents.
+	x := self widthOfContents.
-cachedPreferredExtent := x@y
+	cachedPreferredExtent := x@y
 ].
 ^ cachedPreferredExtent
 !
 recomputeHeightOfContents
 "recompute all the y positions
 "
 |newList
 yAbs "{ Class: SmallInteger }"
 size "{ Class: SmallInteger }"|
 yAbs    := (textStartTop + margin).   "/ top inset of first line
 size    := self size.
 newList := OrderedCollection new:(size + 1).
 newList add:yAbs.
 size ~~ 0 ifTrue:[
-hasConstantHeight ifTrue:[
+	hasConstantHeight ifTrue:[
-constantHeight isNil ifTrue:[ constantHeight := self heightOfAnyNonNilItem ].
+	    constantHeight isNil ifTrue:[ constantHeight := self heightOfAnyNonNilItem ].
-].
+	].
-1 to:size do:[:anIndex|
+	1 to:size do:[:anIndex|
-yAbs := yAbs + (constantHeight notNil
+	    yAbs := yAbs + (constantHeight notNil
-ifTrue:[constantHeight]
+				ifTrue:[constantHeight]
-ifFalse:[self realHeightOfLineAt:anIndex]).
+				ifFalse:[self realHeightOfLineAt:anIndex]).
-newList add:yAbs
+	    newList add:yAbs
-].
+	].
 ].
 startOfLinesY := newList.
 cachedPreferredExtent := nil.
 ! !
 heightOfLineAt:aLineNr
 "returns the height of a line at an index (including lineSpacing...)"
 hasConstantHeight ifTrue:[
-constantHeight isNil ifTrue:[
+	constantHeight isNil ifTrue:[
-constantHeight := self heightOfAnyNonNilItem.
+	    constantHeight := self heightOfAnyNonNilItem.
-].
+	].
-^ constantHeight
+	^ constantHeight
 ].
 ^ self realHeightOfLineAt:aLineNr
 !
 innerHeight
 |item|
 item := self at:aLineNr ifAbsent:nil.
 item notNil ifTrue:[
-^ self lineHeightFor:item
+	^ self lineHeightFor:item
 ].
 ^ font height "arbitrary"
 !
 setWidthOfContents: aWidth
 ^ 10
 !
 viewOrigin
 "return the viewOrigin; thats the coordinate of the contents
 which is shown topLeft in the view.
 "
 ^ viewOrigin
 !
 size  "{ Class:SmallInteger }"
 start "{ Class:SmallInteger }"
 stop  "{ Class:SmallInteger }"
 |
 (widthOfContents notNil and:[computeWidthInRange isNil]) ifTrue:[
-^ widthOfContents + textStartLeft
+	^ widthOfContents + textStartLeft
 ].
 range               := computeWidthInRange.
 computeWidthInRange := nil.
 "/    preferredExtent     := nil.
 "/    cachedPreferredExtent := nil.
 shown ifFalse:[ ^ 60 ].
 size := self size.
 size == 0 ifTrue:[
-widthOfContents := 20.
+	widthOfContents := 20.
 ] ifFalse:[
-widthOfContents isNil ifTrue:[
+	widthOfContents isNil ifTrue:[
-widthOfContents := self widthOfWidestLineBetween:1 and:size
+	    widthOfContents := self widthOfWidestLineBetween:1 and:size
-] ifFalse:[
+	] ifFalse:[
-start := range x.
+	    start := range x.
-stop  := range y min:size.
+	    stop  := range y min:size.
-start > stop ifFalse:[
+	    start > stop ifFalse:[
-size := self widthOfWidestLineBetween:start and:stop.
+		size := self widthOfWidestLineBetween:start and:stop.
-widthOfContents < size ifTrue:[
+		widthOfContents < size ifTrue:[
-widthOfContents := size
+		    widthOfContents := size
-]
+		]
-]
+	    ]
-]
+	]
 ].
 ^ widthOfContents + textStartLeft
 !
 xOriginOfContents
 "return the horizontal origin of the contents in pixels
 "
 ^ viewOrigin x
 !
 yOriginOfContents
 "return the vertical origin of the contents in pixels
 makeLineVisible:aLnNr
 "make the line visible
 "
 aLnNr notNil ifTrue:[
-self scrollToLine:aLnNr
+	self scrollToLine:aLnNr
 ].
 !
 scrollTo:anOrigin redraw:doRedraw
 "change origin to have newOrigin be visible at the top-left.
 dX         "{ Class:SmallInteger }"
 dY         "{ Class:SmallInteger }"
 |
 realized ifFalse:[
-^ self
+	^ self
 ].
 innerWT := self innerWidth.
 innerHG := self innerHeight.
 h := viewOrigin y.
 (y := anOrigin y) > h ifTrue:[              "/ end of contents
-y > (dY := self maxViewOriginY) ifTrue:[
+	y > (dY := self maxViewOriginY) ifTrue:[
-y := dY max:h
+	    y := dY max:h
-]
+	]
 ] ifFalse:[
-y := y max:0.
+	y := y max:0.
 ].
 (x := anOrigin x) > 0 ifTrue:[
-x := x min:(self widthOfContents - innerWT).
+	x := x min:(self widthOfContents - innerWT).
 ].
 x      := x max:0.
 newOrg := (x @ y).
 dltOrg := newOrg - viewOrigin.
 dX     := dltOrg x.
 dY     := dltOrg y.
 (dX == 0 and:[dY == 0]) ifTrue:[
-^ self
+	^ self
 ].
 dY := dY abs.
 dX := dX abs.
 (   (dX ~~ 0 and:[dY ~~ 0])                         "/ scroll vertical & horizontal
 or:[(innerHG - dY < 20 or:[innerWT - dX < 20])]    "/ faster to invalidate screen
 ) ifTrue:[
-viewOrigin := newOrg.
+	viewOrigin := newOrg.
-self originChanged:dltOrg.
+	self originChanged:dltOrg.
-self invalidate.
+	self invalidate.
-^ self
+	^ self
 ].
 (winGrp := self windowGroup) notNil ifTrue:[
-winGrp processRealExposeEventsFor:self.
+	winGrp processRealExposeEventsFor:self.
 ].
 self originWillChange.
 doRedraw ifFalse:[
-viewOrigin := newOrg.
+	viewOrigin := newOrg.
-self originChanged:dltOrg.
+	self originChanged:dltOrg.
-^ self
+	^ self
 ].
 self catchExpose.
 viewOrigin := newOrg.
 dY ~~ 0 ifTrue:[                            "/ SCROLL VERTICAL
-y0 := y1 := margin + dY.
+	y0 := y1 := margin + dY.
-h  := innerHG - dY.
+	h  := innerHG - dY.
-dltOrg y < 0 ifTrue:[y0 := margin. y := y0]
+	dltOrg y < 0 ifTrue:[y0 := margin. y := y0]
-ifFalse:[y1 := margin. y := y1 + h].
+		    ifFalse:[y1 := margin. y := y1 + h].
-self copyFrom:self x:margin y:y0 toX:margin y:y1 width:innerWT height:h async:true.
+	self copyFrom:self x:margin y:y0 toX:margin y:y1 width:innerWT height:h async:true.
-self invalidateX:margin y:y width:innerWT height:(innerHG - h).
+	self invalidateX:margin y:y width:innerWT height:(innerHG - h).
 ] ifFalse:[                                 "/ SCROLL HORIZONTAL
-x0 := x1 := dX + margin.
+	x0 := x1 := dX + margin.
-w  := innerWT - dX.
+	w  := innerWT - dX.
-dltOrg x < 0 ifTrue:[x0 := x := margin ]
+	dltOrg x < 0 ifTrue:[x0 := x := margin ]
-ifFalse:[x1 := margin. x := w].
+		    ifFalse:[x1 := margin. x := w].
-self copyFrom:self x:x0 y:margin toX:x1 y:margin width:w height:innerHG async:true.
+	self copyFrom:self x:x0 y:margin toX:x1 y:margin width:w height:innerHG async:true.
-self invalidateX:x y:margin width:(width - w) height:innerHG.
+	self invalidateX:x y:margin width:(width - w) height:innerHG.
 ].
 self originChanged:dltOrg.
 self waitForExpose.
 winGrp notNil ifTrue:[
-winGrp processRealExposeEventsFor:self.
+	winGrp processRealExposeEventsFor:self.
 ].
 !
 scrollToLine:aLineNumber
 "make line visible
 yTop "{ Class:SmallInteger }"
 orgY "{ Class:SmallInteger }"
 yBot "{ Class:SmallInteger }"
 |
 (shown and:[aLineNumber notNil and:[aLineNumber between:1 and:(self size)]]) ifFalse:[
-^ self
+	^ self
 ].
 yTop := self yAbsoluteOfLine:aLineNumber.
 inHg := self innerHeight.
 orgY := viewOrigin y.
 yTop > orgY ifTrue:[
-yBot := self yAbsoluteOfLine:(aLineNumber + 1).
+	yBot := self yAbsoluteOfLine:(aLineNumber + 1).
-yBot <= (orgY + inHg) ifTrue:[
+	yBot <= (orgY + inHg) ifTrue:[
-^ self
+	    ^ self
-].
+	].
 ].
 yTop := (yTop - (inHg // 2)) max:0.
 self scrollTo:(viewOrigin x @ yTop).
 ! !
 - timeDelta for scroll is computed from distance
 "
 |timeDelta scrollBlock|
 autoScroll ifFalse:[
-self stopAutoScroll.
+	self stopAutoScroll.
-^ self
+	^ self
 ].
 autoScrollBlock notNil ifTrue:[
-Processor removeTimedBlock:autoScrollBlock.
+	Processor removeTimedBlock:autoScrollBlock.
 ] ifFalse:[
-self compressMotionEvents:false.
+	self compressMotionEvents:false.
 ].
 timeDelta := 0.5 / (aDistance abs).
 scrollBlock :=
-[
+	[
-aSelectorOrBlock isSymbol ifTrue:[
+	    aSelectorOrBlock isSymbol ifTrue:[
-self perform:aSelectorOrBlock.
+		self perform:aSelectorOrBlock.
-] ifFalse:[
+	    ] ifFalse:[
-aSelectorOrBlock value
+		aSelectorOrBlock value
-].
+	    ].
-autoScrollBlock notNil ifTrue:[
+	    autoScrollBlock notNil ifTrue:[
-Processor addTimedBlock:autoScrollBlock afterSeconds:timeDelta.
+		Processor addTimedBlock:autoScrollBlock afterSeconds:timeDelta.
-]
+	    ]
-].
+	].
 autoScrollBlock := [self sensor pushUserEvent:#value for:scrollBlock].
 Processor addTimedBlock:autoScrollBlock afterSeconds:timeDelta.
 !
 "
 prepared for ListItemRenderer
 .... SelectionItemRenderer ...
 goal:
-allow the user to redefine the display operation and the dimesion queries
+	allow the user to redefine the display operation and the dimesion queries
 "
 ! !
 !ListModelView::Renderer class methodsFor:'instance creation'!
 x0 := xLeft.
 y0 := yTop.
 anItem isHierarchicalItem ifTrue:[
-anItem displayOn:view x:x0 y:y0 h:h
+	anItem displayOn:view x:x0 y:y0 h:h
 ] ifFalse:[
-anItem isNil ifTrue:[^ self].
+	anItem isNil ifTrue:[^ self].
-y0    := y0 - ((self heightFor:anItem) + 1 - h // 2).
+	y0    := y0 - ((self heightFor:anItem) + 1 - h // 2).
-label := anItem.
+	label := anItem.
-label isImageOrForm ifFalse:[
+	label isImageOrForm ifFalse:[
-label isNumber ifTrue:[
+	    label isNumber ifTrue:[
-label := label printString
+		label := label printString
-].
+	    ].
-y0 := y0 + view font ascent
+	    y0 := y0 + view font ascent
-].
+	].
-label displayOn:view x:x0 y:y0
+	label displayOn:view x:x0 y:y0
 ].
 !
 postRedrawX:damageX y:yStartOrYDamage w:damageWidth from:startOrNil to:stopOrNil
 "called after redraw of the items in range from start to stop is done;
 receiver := aReceiver.
 minimumRequiredColumnHeight := 0.
 aSeqOfColumnSpecs size == 0 ifTrue:[
-columnDescriptors := #().
+	columnDescriptors := #().
 ] ifFalse:[
-columnDescriptors := aSeqOfColumnSpecs collect:[:aColumnSpec|
+	columnDescriptors := aSeqOfColumnSpecs collect:[:aColumnSpec|
-ColumnDescriptor dataSetColumnSpec:aColumnSpec
+	    ColumnDescriptor dataSetColumnSpec:aColumnSpec
-].
+	].
-columnDescriptors keysAndValuesDo:[:colNr :spec|
+	columnDescriptors keysAndValuesDo:[:colNr :spec|
-spec columnNumber:colNr.
+	    spec columnNumber:colNr.
-minimumRequiredColumnHeight :=
+	    minimumRequiredColumnHeight :=
-minimumRequiredColumnHeight max:(spec minimumRequiredColumnHeight).
+		    minimumRequiredColumnHeight max:(spec minimumRequiredColumnHeight).
-].
+	].
 ].
 hasFixedItemWidth := attributes at:#hasFixedItemWidth ifAbsent:[false].
 xInset      := 2 * self splitbarInset.
 numCols     := columnDescriptors size.
 xSplitbars  := Array new:(numCols + 1).
 xSplitbars at:1 put:xOffset.
 1 to:numCols do:[:aColNr|
-xOffset := xOffset + xInset + (self defaultColumnWidthAt:aColNr).
+	xOffset := xOffset + xInset + (self defaultColumnWidthAt:aColNr).
-xSplitbars at:(aColNr + 1) put:xOffset.
+	xSplitbars at:(aColNr + 1) put:xOffset.
 ].
 self splitbarsChanged
 !
 numberOfColumns
 separatorOneDColor
 "answer the color used for drawing separators"
 separatorOneDColor isNil ifTrue:[
-separatorOneDColor := self class separatorOneDColor.
+	separatorOneDColor := self class separatorOneDColor.
-(view notNil and:[view realized]) ifTrue:[
+	(view notNil and:[view realized]) ifTrue:[
-separatorOneDColor := separatorOneDColor onDevice:(view device).
+	    separatorOneDColor := separatorOneDColor onDevice:(view device).
-].
+	].
 ].
 ^ separatorOneDColor
 !
 showHorizontalSeparators
 used to drag splitbars"
 |xOld xNew xPrv deltaX xAbsoluteOfFirstSplitbar|
 aSepIndex == 1 ifTrue:[
-hasFixedItemWidth := true.
+	hasFixedItemWidth := true.
-xPrv := view margin.
+	xPrv := view margin.
 ] ifFalse:[
-xPrv := xSplitbars at:(aSepIndex - 1).
+	xPrv := xSplitbars at:(aSepIndex - 1).
 ].
 aSepIndex == 1 ifTrue:[
-hasFixedItemWidth := true.
+	hasFixedItemWidth := true.
-xPrv := view margin.
+	xPrv := view margin.
 ] ifFalse:[
-xPrv := xSplitbars at:(aSepIndex - 1).
+	xPrv := xSplitbars at:(aSepIndex - 1).
 ].
 xOld := xSplitbars at:aSepIndex.
 xNew := x max:xPrv.
 deltaX := xNew - xOld.
 deltaX = 0 ifTrue:[ ^ self ].
 xAbsoluteOfFirstSplitbar := xSplitbars at:1.
 xSplitbars from:aSepIndex keysAndValuesDo:[:sepIdx :sepX|
-xSplitbars at:sepIdx put:(sepX + deltaX).
+	xSplitbars at:sepIdx put:(sepX + deltaX).
 ].
 view setWidthOfContents:(xSplitbars last).
 view shown ifTrue:[
-|damage width height orgX|
+	|damage width height orgX|
-view windowGroup processRealExposeEventsFor:self.
+	view windowGroup processRealExposeEventsFor:self.
-width  := view width.
+	width  := view width.
-height := view height.
+	height := view height.
-orgX   := view viewOrigin x.
+	orgX   := view viewOrigin x.
-xNew := ((xNew - orgX) max:0) min:width.
+	xNew := ((xNew - orgX) max:0) min:width.
-xOld := ((xOld - orgX) max:0) min:width.
+	xOld := ((xOld - orgX) max:0) min:width.
-xPrv := ((xPrv - orgX) max:0) min:width.
+	xPrv := ((xPrv - orgX) max:0) min:width.
-xOld > xNew ifTrue:[                                    "/ <- copy to left
+	xOld > xNew ifTrue:[                                    "/ <- copy to left
-deltaX := xOld - xNew.
+	    deltaX := xOld - xNew.
-view copyFrom:view x:xOld y:0 toX:xNew y:0
+	    view copyFrom:view x:xOld y:0 toX:xNew y:0
-width:(width - xOld) height:height.
+		    width:(width - xOld) height:height.
-damage := Rectangle left:(width - deltaX) top:0 width:deltaX height:height.
+	    damage := Rectangle left:(width - deltaX) top:0 width:deltaX height:height.
-view invalidateDeviceRectangle:damage repairNow:false.
+	    view invalidateDeviceRectangle:damage repairNow:false.
-] ifFalse:[
+	] ifFalse:[
-xOld < xNew ifTrue:[                                "/ -> copy to right
+	    xOld < xNew ifTrue:[                                "/ -> copy to right
-view copyFrom:view x:xOld y:0 toX:xNew y:0
+		view copyFrom:view x:xOld y:0 toX:xNew y:0
-width:(width - xNew) height:height.
+			width:(width - xNew) height:height.
-].
+	    ].
-].
+	].
-xNew > xPrv ifTrue:[
+	xNew > xPrv ifTrue:[
-"/ should not invalidate the items display range..."
+	    "/ should not invalidate the items display range..."
-xAbsoluteOfFirstSplitbar := xAbsoluteOfFirstSplitbar - self splitbarInset.
+	    xAbsoluteOfFirstSplitbar := xAbsoluteOfFirstSplitbar - self splitbarInset.
-xPrv := (xPrv max:xAbsoluteOfFirstSplitbar).
+	    xPrv := (xPrv max:xAbsoluteOfFirstSplitbar).
-xNew > xPrv ifTrue:[
+	    xNew > xPrv ifTrue:[
-damage := Rectangle left:xPrv top:0 width:(xNew -xPrv) height:height.
+		damage := Rectangle left:xPrv top:0 width:(xNew -xPrv) height:height.
-view invalidateDeviceRectangle:damage repairNow:false.
+		view invalidateDeviceRectangle:damage repairNow:false.
-].
+	    ].
-].
+	].
 ].
 view contentsChanged.
 ! !
 !ListModelView::TableRenderer methodsFor:'change & update'!
 splitbarsChanged
 "called if the splitbars has changed; recompute the width of contents"
 view notNil ifTrue:[
-|newWidth oldWidth|
+	|newWidth oldWidth|
-oldWidth := view getWidthOfContents.
+	oldWidth := view getWidthOfContents.
-oldWidth notNil ifTrue:[
+	oldWidth notNil ifTrue:[
-newWidth := xSplitbars last.
+	    newWidth := xSplitbars last.
-newWidth ~= oldWidth ifTrue:[
+	    newWidth ~= oldWidth ifTrue:[
-view setWidthOfContents:newWidth.
+		view setWidthOfContents:newWidth.
-view contentsChanged.
+		view contentsChanged.
-].
+	    ].
-view invalidate.
+	    view invalidate.
-].
+	].
 ].
 !
 withinUpdateFromListDo:aBlock
 "handle an change & update within the view"
 xAbs := xSplitbars last.
 super withinUpdateFromListDo:aBlock.
 xAbs ~~ xSplitbars last ifTrue:[
-self splitbarsChanged
+	self splitbarsChanged
 ].
 ! !
 !ListModelView::TableRenderer methodsFor:'displaying'!
 xNxt := xSplitbars first - xTrs.
 xNxt >= xMax ifTrue:[^ self].
 view hasSelection ifTrue:[
-hgFgColor := view hilightForegroundColor.
+	hgFgColor := view hilightForegroundColor.
-hgBgColor := view hilightBackgroundColor.
+	hgBgColor := view hilightBackgroundColor.
 ].
 fgColor := view foregroundColor.
 bgColor := view backgroundColor.
 clip    := view clipRect.
 clip isNil ifTrue:[
-clip := Rectangle left:xDmg top:yStart width:wDmg height:(view height - yStart).
+	clip := Rectangle left:xDmg top:yStart width:wDmg height:(view height - yStart).
 ].
 colInset := self splitbarInset.
 2 to:numSplitbars do:[:anIndex|
-|clipLft clipRgt colWdth colDesc|
+	|clipLft clipRgt colWdth colDesc|
-xNxt < xMax ifFalse:[^ self].
+	xNxt < xMax ifFalse:[^ self].
-x0   := xNxt.
+	x0   := xNxt.
-xNxt := (xSplitbars at:anIndex) - xTrs.
+	xNxt := (xSplitbars at:anIndex) - xTrs.
-x1   := xNxt.
+	x1   := xNxt.
-"/ workaround due to drawing the selection frame
+	"/ workaround due to drawing the selection frame
-anIndex == numSplitbars ifTrue:[ x1 := x1 + self textStartLeft ].
+	anIndex == numSplitbars ifTrue:[ x1 := x1 + self textStartLeft ].
-colDesc := columnDescriptors at:(anIndex - 1) ifAbsent:[ ^ self ].    "/ can give up...
+	colDesc := columnDescriptors at:(anIndex - 1) ifAbsent:[ ^ self ].    "/ can give up...
-clipLft := x0 max:xDmg.
+	clipLft := x0 max:xDmg.
-clipRgt := x1 min:xMax.
+	clipRgt := x1 min:xMax.
-colWdth := x1 - x0.
+	colWdth := x1 - x0.
-(colWdth > 2 and:[clipLft < clipRgt]) ifTrue:[
+	(colWdth > 2 and:[clipLft < clipRgt]) ifTrue:[
-clip := clip copy.
+	    clip := clip copy.
-clip setLeft:clipLft.
+	    clip setLeft:clipLft.
-clip right:clipRgt.
+	    clip right:clipRgt.
-view clippingRectangle:clip.
+	    view clippingRectangle:clip.
-y1 := yStart.
+	    y1 := yStart.
-start to:stop do:[:aRowNr| |recv|
+	    start to:stop do:[:aRowNr| |recv|
-y0   := y1.
+		y0   := y1.
-y1   := view yVisibleOfLine:(aRowNr + 1).
+		y1   := view yVisibleOfLine:(aRowNr + 1).
-recv := receiver.
+		recv := receiver.
-recv isNil ifTrue:[ recv := view at:aRowNr ifAbsent:nil ].
+		recv isNil ifTrue:[ recv := view at:aRowNr ifAbsent:nil ].
-recv notNil ifTrue:[
+		recv notNil ifTrue:[
-(hgFgColor notNil and:[view isInSelection:aRowNr]) ifTrue:[
+		    (hgFgColor notNil and:[view isInSelection:aRowNr]) ifTrue:[
-shownSelected := true.
+			shownSelected := true.
-view paint:hgFgColor on:hgBgColor
+			view paint:hgFgColor on:hgBgColor
-] ifFalse:[
+		    ] ifFalse:[
-shownSelected := false.
+			shownSelected := false.
-view paint:fgColor on:bgColor.
+			view paint:fgColor on:bgColor.
-].
+		    ].
-colDesc
+		    colDesc
-drawRowAt:aRowNr
+			drawRowAt:aRowNr
-shownSelected:shownSelected
+			shownSelected:shownSelected
-receiver:recv
+			receiver:recv
-x:x0 + colInset
+			x:x0 + colInset
-y:y0
+			y:y0
-w:colWdth - colInset - colInset
+			w:colWdth - colInset - colInset
-h:(y1 - y0) on:view.
+			h:(y1 - y0) on:view.
-].
+		].
-].
+	    ].
-].
+	].
 ].
 !
 drawHorizontalSeparatorsX:x y:y w:w from:start to:stop
 "draw horizontal seperators from start to stop.
 x1 <= x ifTrue:[^ self].
 x0 := x.
 self showHorizontalSeparatorsForItem ifFalse:[
-x0 := x0 max:(self xVisibleOfSplitbarAt:1).
+	x0 := x0 max:(self xVisibleOfSplitbarAt:1).
-x1 <= x0 ifTrue:[^ self].
+	x1 <= x0 ifTrue:[^ self].
 ].
 clipRec := Rectangle left:x0 top:0 right:x1 bottom:(view height).
 view clippingRectangle:clipRec.
 view paint:(self separatorOneDColor).
 start to:stop do:[:aRowNr|
-ySep := (view yVisibleOfLine:(aRowNr + 1)) - 1.
+	ySep := (view yVisibleOfLine:(aRowNr + 1)) - 1.
-view displayLineFromX:x0 y:ySep toX:x1 y:ySep.
+	view displayLineFromX:x0 y:ySep toX:x1 y:ySep.
 ].
 !
 drawVerticalSplitbarsX:x0 y:y0 w:w from:start to:stop
 "draw vertical splitbars"
 "/ workaround for textStartTop
 y1 := view height.
 self showVerticalSplitbarsBelowContents ifFalse:[
-stop isNil ifTrue:[^ self].
+	stop isNil ifTrue:[^ self].
-y1 := y1 min:(view yVisibleOfLine:(stop + 1)).
+	y1 := y1 min:(view yVisibleOfLine:(stop + 1)).
-y1 <= y0 ifTrue:[ ^ self ].
+	y1 <= y0 ifTrue:[ ^ self ].
 ].
 x1 := x0 + w.
 vX := view viewOrigin x.
 xSplitbars keysAndValuesDo:[:anIndex :physY|
-(self showVerticalSplitbarAt:anIndex) ifTrue:[
+	(self showVerticalSplitbarAt:anIndex) ifTrue:[
-x := physY - vX.
+	    x := physY - vX.
-x > x1 ifTrue:[^ self]. "/ can giveup - behind max x1
+	    x > x1 ifTrue:[^ self]. "/ can giveup - behind max x1
-anIndex == nrOfSep ifTrue:[
+	    anIndex == nrOfSep ifTrue:[
-"/ workaround due to drawing the selection frame
+		"/ workaround due to drawing the selection frame
-x := x + self textStartLeft
+		x := x + self textStartLeft
-].
+	    ].
-x >= x0  ifTrue:[
+	    x >= x0  ifTrue:[
-clipRec isNil ifTrue:[
+		clipRec isNil ifTrue:[
-"/ first time to setup clipping and colors
+		    "/ first time to setup clipping and colors
-clipRec := Rectangle left:x0 top:y0 right:x1 bottom:y1.
+		    clipRec := Rectangle left:x0 top:y0 right:x1 bottom:y1.
-view clippingRectangle:clipRec.
+		    view clippingRectangle:clipRec.
-view paint:(self separatorOneDColor).
+		    view paint:(self separatorOneDColor).
-].
+		].
-view displayLineFromX:x y:y0 toX:x y:y1.
+		view displayLineFromX:x y:y0 toX:x y:y1.
-].
+	    ].
-].
+	].
 ].
 !
 postRedrawX:x y:y w:w from:start to:stop
 "draw columns and than the splitbars"
 self drawColumnsFrom:start to:stop x:x y:y w:w.
 self showHorizontalSeparators ifTrue:[
-self drawHorizontalSeparatorsX:x y:y w:w from:start to:stop.
+	self drawHorizontalSeparatorsX:x y:y w:w from:start to:stop.
 ].
 self showVerticalSplitbars ifTrue:[
-self drawVerticalSplitbarsX:x y:y w:w from:start to:stop.
+	self drawVerticalSplitbarsX:x y:y w:w from:start to:stop.
 ].
 !
 validateDrawableItemsFrom:start to:stop
 "called before drawing the items in range from start to stop; the
 !ListModelView::TableRenderer methodsFor:'enumerating'!
 columnDescriptorsDo:aOneArgBlock
 columnDescriptors size > 0 ifTrue:[
-columnDescriptors do:aOneArgBlock.
+	columnDescriptors do:aOneArgBlock.
 ].
 !
 columnDescriptorsKeysAndValuesDo:aTwoArgBlock
 columnDescriptors size > 0 ifTrue:[
-columnDescriptors keysAndValuesDo:aTwoArgBlock.
+	columnDescriptors keysAndValuesDo:aTwoArgBlock.
 ].
 !
 xSplitbarsDo:aOneArgblock
 "evaluate a block on each x splitbar position
 "add event hook to window group"
 |winGrp|
 view notNil ifTrue:[
-winGrp := view windowGroup.
+	winGrp := view windowGroup.
-winGrp notNil ifTrue:[
+	winGrp notNil ifTrue:[
-view enableMotionEvents.
+	    view enableMotionEvents.
-winGrp addPreEventHook:self.
+	    winGrp addPreEventHook:self.
-].
+	].
 ].
 !
 processEvent:ev
 "only handled if drag splitbar is enabled"
 ev isInputEvent ifFalse:[^ false].
 dragOperation notNil ifTrue:[
-dragOperation value:ev.
+	dragOperation value:ev.
-^ true
+	^ true
 ].
 (view shown
 and:[ev view == view
 and:[(ev isButtonPressEvent or:[ev isButtonMotionEvent])
 and:[((ev button == 2) or:[ev button == #menu]) not]]]) ifTrue:[
-|colIndex phyX colX|
+	|colIndex phyX colX|
-colIndex := self xVisibleToSplitbar:(ev x).
+	colIndex := self xVisibleToSplitbar:(ev x).
-(colIndex > 0 and:[self showVerticalSplitbarsBelowContents not]) ifTrue:[
+	(colIndex > 0 and:[self showVerticalSplitbarsBelowContents not]) ifTrue:[
-"/ test whether y is below contents....
+	    "/ test whether y is below contents....
-ev y > (view heightOfContents - view viewOrigin y) ifTrue:[
+	    ev y > (view heightOfContents - view viewOrigin y) ifTrue:[
-colIndex := 0
+		colIndex := 0
-].
+	    ].
-].
+	].
-ev isButtonPressEvent ifTrue:[
+	ev isButtonPressEvent ifTrue:[
-colIndex < 1 ifTrue:[^ false].
+	    colIndex < 1 ifTrue:[^ false].
-colX := self xAbsoluteOfSplitbarAt:colIndex.
+	    colX := self xAbsoluteOfSplitbarAt:colIndex.
-phyX := ev x.
+	    phyX := ev x.
-dragOperation := [:event|
+	    dragOperation := [:event|
-event isKeyEvent ifTrue:[
+		event isKeyEvent ifTrue:[
-event rawKey == #Escape ifTrue:[
+		    event rawKey == #Escape ifTrue:[
-dragOperation := nil.
+			dragOperation := nil.
-self moveSplitbarAt:colIndex toAbsoluteX:colX.
+			self moveSplitbarAt:colIndex toAbsoluteX:colX.
-].
+		    ].
-] ifFalse:[
+		] ifFalse:[
-event isButtonPressEvent ifTrue:[
+		    event isButtonPressEvent ifTrue:[
-dragOperation := nil.
+			dragOperation := nil.
-self moveSplitbarAt:colIndex toAbsoluteX:colX.
+			self moveSplitbarAt:colIndex toAbsoluteX:colX.
-].
+		    ].
-event isButtonReleaseEvent ifTrue:[
+		    event isButtonReleaseEvent ifTrue:[
-dragOperation := nil.
+			dragOperation := nil.
-].
+		    ].
-event isButtonMotionEvent ifTrue:[
+		    event isButtonMotionEvent ifTrue:[
-(view sensor hasExposeEventFor:nil) ifFalse:[
+			(view sensor hasExposeEventFor:nil) ifFalse:[
-self
+			    self
-moveSplitbarAt:colIndex
+				moveSplitbarAt:colIndex
-toAbsoluteX:(colX + (event x) - phyX).
+				toAbsoluteX:(colX + (event x) - phyX).
-].
+			].
-].
+		    ].
-].
+		].
-].
+	    ].
-^ true
+	    ^ true
-].
+	].
-colIndex == 0 ifTrue:[
+	colIndex == 0 ifTrue:[
-savedCursor notNil ifTrue:[
+	    savedCursor notNil ifTrue:[
-view cursor:savedCursor.
+		view cursor:savedCursor.
-savedCursor := nil.
+		savedCursor := nil.
-].
+	    ].
-] ifFalse:[
+	] ifFalse:[
-savedCursor isNil ifTrue:[
+	    savedCursor isNil ifTrue:[
-savedCursor := view cursor.
+		savedCursor := view cursor.
-view cursor:dragCursor.
+		view cursor:dragCursor.
-].
+	    ].
-].
+	].
 ].
 ^ false
 !
 removeEventHook
 "release my event hook"
 |winGrp|
 view notNil ifTrue:[
-winGrp := view windowGroup.
+	winGrp := view windowGroup.
-winGrp notNil ifTrue:[ winGrp removePreEventHook:self ].
+	winGrp notNil ifTrue:[ winGrp removePreEventHook:self ].
 ].
 ! !
 !ListModelView::TableRenderer methodsFor:'instance creation'!
 forView:aView
 "setup instance for a view;
 setup my default columnDescription"
 attributes isNil ifTrue:[
-attributes := IdentityDictionary new.
+	attributes := IdentityDictionary new.
 ].
 self columnDescriptors:nil.
 super forView:aView.
 !
 mapped
 "install event hook and enable motion events
 "
 view notNil ifTrue:[
-dragCursor isNil ifTrue:[
+	dragCursor isNil ifTrue:[
-dragCursor := self class dragCursor onDevice:(view device).
+	    dragCursor := self class dragCursor onDevice:(view device).
-].
+	].
-separatorOneDColor notNil ifTrue:[
+	separatorOneDColor notNil ifTrue:[
-separatorOneDColor := separatorOneDColor onDevice:(view device).
+	    separatorOneDColor := separatorOneDColor onDevice:(view device).
-].
+	].
-self isDragEnabled ifTrue:[ self addEventHook ].
+	self isDragEnabled ifTrue:[ self addEventHook ].
 ].
 !
 release
 "release event hook
 defaultColumnWidthAt:aColIndex
 ^ (columnDescriptors at:aColIndex) defaultColumnWidth
 !
 showVerticalSplitbarAt:aColIndex
 aColIndex > 1 ifTrue:[
-^ (columnDescriptors at:(aColIndex - 1)) showVerticalSplitbar
+	^ (columnDescriptors at:(aColIndex - 1)) showVerticalSplitbar
 ].
 ^ true
 ! !
 !ListModelView::TableRenderer methodsFor:'queries-behavior'!
 "answer true if drag of separators is enabled"
 attributes at:#isDragEnabled put:aBoolean.
 aBoolean ifTrue:[ self addEventHook ]
-ifFalse:[ self removeEventHook ].
+	    ifFalse:[ self removeEventHook ].
 ! !
 !ListModelView::TableRenderer methodsFor:'queries-dimensions'!
 heightFor:anItem
 |xStart xStop xDiff inset|
 xStart := view xAbsoluteOfItem:anItem.
 hasFixedItemWidth ifFalse:[
-inset := self splitbarInset.
+	inset := self splitbarInset.
-xStop := (anItem widthOn:view) + xStart + inset + inset.
+	xStop := (anItem widthOn:view) + xStart + inset + inset.
-xDiff := xStop - xSplitbars first.
+	xDiff := xStop - xSplitbars first.
-xDiff > 0 ifTrue:[
+	xDiff > 0 ifTrue:[
-xDiff := xDiff + 10.        "/ add more to have less computation
+	    xDiff := xDiff + 10.        "/ add more to have less computation
-xSplitbars := xSplitbars collect:[:xSep| xSep + xDiff ].
+	    xSplitbars := xSplitbars collect:[:xSep| xSep + xDiff ].
-].
+	].
 ].
 ^ xSplitbars last - xStart
 !
 widthOfColumn:aColumn
 |index x0 x1|
 index := columnDescriptors identityIndexOf:aColumn.
 index > 0 ifTrue:[
-(     (x0 := xSplitbars at:index       ifAbsent:nil) notNil
+	(     (x0 := xSplitbars at:index       ifAbsent:nil) notNil
-and:[(x1 := xSplitbars at:(index + 1) ifAbsent:nil) notNil])
+	 and:[(x1 := xSplitbars at:(index + 1) ifAbsent:nil) notNil])
-ifTrue:[
+	ifTrue:[
-^ (x1 - x0 - (2 * (self splitbarInset))) max:0
+	    ^ (x1 - x0 - (2 * (self splitbarInset))) max:0
-].
+	].
 ].
 ^ nil
 !
 widthOfItemColumn
 "returns the width of the longest line in pixels in a range
 "
 |item|
 hasFixedItemWidth ifFalse:[
-firstLine to:lastLine do:[:i|
+	firstLine to:lastLine do:[:i|
-item := view at:i ifAbsent:nil.
+	    item := view at:i ifAbsent:nil.
-item notNil ifTrue:[self widthFor:item].
+	    item notNil ifTrue:[self widthFor:item].
-].
+	].
 ].
 ^ xSplitbars last
 !
 xAbsoluteOfSplitbarAt:anIndex
 minX  := absX - 2.
 maxX  := absX + 2.
 "/ must walk reverse because a column could have a zero width
 xSplitbars keysAndValuesReverseDo:[:index :x|
-(x between:minX and:maxX) ifTrue:[^ index].
+	(x between:minX and:maxX) ifTrue:[^ index].
 ].
 ^ 0
 !
 xVisibleOfLastSplitbar
 ^ self new dataSetColumnSpec:aDataSetColumnSpec
 !
 new
 ClipColumnQuerySignal isNil ifTrue:[
-ClipColumnQuerySignal := QuerySignal new.
+	ClipColumnQuerySignal := QuerySignal new.
 ].
 ^ self basicNew initialize
 ! !
 !ListModelView::TableRenderer::ColumnDescriptor methodsFor:'accessing'!
 !
 dataSetColumnSpec:aDataSetColumnSpec
 aDataSetColumnSpec isSequenceable ifTrue:[
-dataSetColumnSpec := DataSetColumnSpec decodeFromLiteralArray:aDataSetColumnSpec.
+	dataSetColumnSpec := DataSetColumnSpec decodeFromLiteralArray:aDataSetColumnSpec.
 ] ifFalse:[
-dataSetColumnSpec := aDataSetColumnSpec.
+	dataSetColumnSpec := aDataSetColumnSpec.
 ].
 !
 defaultColumnWidth
 |width|
 "display a column for a specific row"
 |deviceClipRectangle paint savedPaint label|
 isShownSelected ifFalse:[
-"/ draw the background color if required by spec..
+	"/ draw the background color if required by spec..
-paint := self extractBackgroundColorFrom:aReceiver rowNr:aRowNr on:aGC.
+	paint := self extractBackgroundColorFrom:aReceiver rowNr:aRowNr on:aGC.
-paint notNil ifTrue:[
+	paint notNil ifTrue:[
-savedPaint := aGC paint.
+	    savedPaint := aGC paint.
-aGC paint:paint.
+	    aGC paint:paint.
-"/ splitbarInset - draw from 0 to width of aGC (is clipped)
+	    "/ splitbarInset - draw from 0 to width of aGC (is clipped)
-aGC fillRectangleX:0 y:y width:(aGC width) height:h.
+	    aGC fillRectangleX:0 y:y width:(aGC width) height:h.
-].
+	].
 ].
 w < 5 ifTrue:[ ^ self ].    "/ makes no sense to draw the label
 label := self extractColumnFrom:aReceiver rowNr:aRowNr on:aGC.
 label isEmptyOrNil ifTrue:[^ self].
 ClipColumnQuerySignal handle:[:ex|
-deviceClipRectangle isNil ifTrue:[
+	deviceClipRectangle isNil ifTrue:[
-deviceClipRectangle := aGC clippingRectangleOrNil.
+	    deviceClipRectangle := aGC clippingRectangleOrNil.
-aGC clippingRectangle:(Rectangle left:x top:y width:w height:h).
+	    aGC clippingRectangle:(Rectangle left:x top:y width:w height:h).
-].
+	].
-ex proceedWith:true.
+	ex proceedWith:true.
 ] do:[
-isShownSelected ifFalse:[
+	isShownSelected ifFalse:[
-paint := self extractForegroundColorFrom:aReceiver rowNr:aRowNr on:aGC.
+	    paint := self extractForegroundColorFrom:aReceiver rowNr:aRowNr on:aGC.
-paint notNil ifTrue:[
+	    paint notNil ifTrue:[
-aGC paint:paint.
+		aGC paint:paint.
-] ifFalse:[
+	    ] ifFalse:[
-savedPaint notNil ifTrue:[ aGC paint:savedPaint ].
+		savedPaint notNil ifTrue:[ aGC paint:savedPaint ].
-].
+	    ].
-].
+	].
-self drawObject:label x:x y:y w:w h:h on:aGC.
+	self drawObject:label x:x y:y w:w h:h on:aGC.
 ].
 deviceClipRectangle notNil ifTrue:[
-aGC deviceClippingRectangle:deviceClipRectangle.
+	aGC deviceClippingRectangle:deviceClipRectangle.
 ].
 ! !
 !ListModelView::TableRenderer::ColumnDescriptor methodsFor:'extract values'!
 extractBackgroundColorFrom:aReceiver rowNr:aRowNr on:aView
 |color selector|
 aReceiver notNil ifTrue:[
-selector := dataSetColumnSpec backgroundSelector.
+	selector := dataSetColumnSpec backgroundSelector.
-selector notNil ifTrue:[
+	selector notNil ifTrue:[
-color := aReceiver perform:selector withOptionalArgument:columnNumber and:aRowNr and:aView.
+	    color := aReceiver perform:selector withOptionalArgument:columnNumber and:aRowNr and:aView.
-color notNil ifTrue:[ ^ color ].
+	    color notNil ifTrue:[ ^ color ].
-].
+	].
 ].
 ^ dataSetColumnSpec backgroundColor.
 !
 extractColumnFrom:aReceiver rowNr:aRowNr on:aView
 |selector|
 aReceiver notNil ifTrue:[
-selector := dataSetColumnSpec readSelector.
+	selector := dataSetColumnSpec readSelector.
-selector notNil ifTrue:[
+	selector notNil ifTrue:[
-^ aReceiver perform:selector withOptionalArgument:columnNumber and:aRowNr and:aView
+	    ^ aReceiver perform:selector withOptionalArgument:columnNumber and:aRowNr and:aView
-].
+	].
 ].
 ^ nil
 !
 extractForegroundColorFrom:aReceiver rowNr:aRowNr on:aView
 |color selector|
 aReceiver notNil ifTrue:[
-selector := dataSetColumnSpec foregroundSelector.
+	selector := dataSetColumnSpec foregroundSelector.
-selector notNil ifTrue:[
+	selector notNil ifTrue:[
-color := aReceiver perform:selector withOptionalArgument:columnNumber and:aRowNr and:aView.
+	    color := aReceiver perform:selector withOptionalArgument:columnNumber and:aRowNr and:aView.
-color notNil ifTrue:[ ^ color ].
+	    color notNil ifTrue:[ ^ color ].
-].
+	].
 ].
 ^ dataSetColumnSpec foregroundColor.
 ! !
 !ListModelView::TableRenderer::ColumnDescriptor methodsFor:'instance creation'!
 x0    := x.
 align := self alignment.
 align ~~ #left ifTrue:[
-width := anObject widthOn:aGC.
+	width := anObject widthOn:aGC.
-width < w ifTrue:[
+	width < w ifTrue:[
-align == #right ifTrue:[
+	    align == #right ifTrue:[
-x0 := x0 + w - width
+		x0 := x0 + w - width
-] ifFalse:[
+	    ] ifFalse:[
-x0 := x0 + ((w - width) // 2)
+		x0 := x0 + ((w - width) // 2)
-].
+	    ].
-].
+	].
 ].
 anObject displayOn:aGC x:x0 y:y.
 !
 displayImage:anImage x:x y:y w:w h:h on:aGC
 |height|
 height := anImage heightOn:aGC.
 height > h ifTrue:[
-(self queryForClipColumnWithAvailableHeight:h) ifFalse:[
+	(self queryForClipColumnWithAvailableHeight:h) ifFalse:[
-^ height
+	    ^ height
-].
+	].
 ].
 self alignAndDisplay:anImage x:x y:y w:w on:aGC.
 ^ height
 !
 |height|
 height := aLabelAndIcon heightOn:aGC.
 height > h ifTrue:[
-(self queryForClipColumnWithAvailableHeight:h) ifFalse:[
+	(self queryForClipColumnWithAvailableHeight:h) ifFalse:[
-^ height
+	    ^ height
-].
+	].
 ].
 self alignAndDisplay:aLabelAndIcon x:x y:(y + aGC font ascent) w:w on:aGC.
 ^ height
 !
 fontHeight := font height.
 aString isEmptyOrNil ifTrue:[ ^ fontHeight ].
 (self queryForClipColumnWithAvailableHeight:h) ifFalse:[
-^ fontHeight
+	^ fontHeight
 ].
 dataSetColumnSpec longStringCompression ifTrue:[
-shortWidth := font widthOf:aString.
+	shortWidth := font widthOf:aString.
-shortWidth <= w ifTrue:[
+	shortWidth <= w ifTrue:[
-shortedLabel := aString.
+	    shortedLabel := aString.
-] ifFalse:[
+	] ifFalse:[
-|dottedString dottedWidth index|
+	    |dottedString dottedWidth index|
-dottedString := '...'.
+	    dottedString := '...'.
-dottedWidth  := font widthOf:dottedString.
+	    dottedWidth  := font widthOf:dottedString.
-w < dottedWidth ifTrue:[ ^ fontHeight ].   "/ give up
+	    w < dottedWidth ifTrue:[ ^ fontHeight ].   "/ give up
-index := aString size // 2.
+	    index := aString size // 2.
-[   index := index - 1.
+	    [   index := index - 1.
-index > 0 ifTrue:[
+		index > 0 ifTrue:[
-shortedLabel := (aString copyFirst:index), '...', (aString copyLast:index).
+		    shortedLabel := (aString copyFirst:index), '...', (aString copyLast:index).
-shortWidth   := font widthOf:shortedLabel.
+		    shortWidth   := font widthOf:shortedLabel.
-] ifFalse:[
+		] ifFalse:[
-shortedLabel := dottedString.
+		    shortedLabel := dottedString.
-shortWidth   := dottedWidth.
+		    shortWidth   := dottedWidth.
-].
+		].
-shortWidth > w
+		shortWidth > w
-] whileTrue.
+	    ] whileTrue.
-].
+	].
 ] ifFalse:[
-shortedLabel := aString
+	shortedLabel := aString
 ].
 shortedLabel notNil ifTrue:[
-self alignAndDisplay:shortedLabel x:x y:(y + aGC font ascent) w:w on:aGC.
+	self alignAndDisplay:shortedLabel x:x y:(y + aGC font ascent) w:w on:aGC.
 ].
 ^ fontHeight.
 !
 drawObject:anObject x:x y:y w:w h:h on:aGC
 h < 4 ifTrue:[ ^ h ].
 anObject isEmptyOrNil ifTrue:[ ^ 2 ]. "/ nothing to draw; add 2 pixels
 anObject isImage ifTrue:[
-^ self displayImage:anObject x:x y:y w:w h:h on:aGC.
+	^ self displayImage:anObject x:x y:y w:w h:h on:aGC.
 ].
 anObject isString ifTrue:[
-^ self displayString:anObject x:x y:y w:w h:h on:aGC.
+	^ self displayString:anObject x:x y:y w:w h:h on:aGC.
 ].
 anObject isSequenceable ifFalse:[
-"/ not yet handled....
+	"/ not yet handled....
-anObject class == LabelAndIcon ifTrue:[
+	anObject class == LabelAndIcon ifTrue:[
-^ self displayLabelAndIcon:anObject x:x y:y w:w h:h on:aGC
+	    ^ self displayLabelAndIcon:anObject x:x y:y w:w h:h on:aGC
-].
+	].
-^ self displayString:(anObject printString) x:x y:y w:w h:h on:aGC
+	^ self displayString:(anObject printString) x:x y:y w:w h:h on:aGC
 ].
 totalHeight := 0.
 anObject do:[:aSubObj|
-totalHeight < h ifTrue:[
+	totalHeight < h ifTrue:[
-usedHeight := self
+	    usedHeight := self
-drawObject:aSubObj
+		    drawObject:aSubObj
-x:x
+		    x:x
-y:(y + totalHeight)
+		    y:(y + totalHeight)
-w:w
+		    w:w
-h:(h - totalHeight)
+		    h:(h - totalHeight)
-on:aGC.
+		    on:aGC.
-totalHeight := totalHeight + usedHeight.
+	    totalHeight := totalHeight + usedHeight.
-].
+	].
 ].
 ^ (h - totalHeight)
 !
 queryForClipColumnWithAvailableHeight:anAvailableHeight
 anAvailableHeight > 8 ifTrue:[
-^ (ClipColumnQuerySignal query) == true
+	^ (ClipColumnQuerySignal query) == true
 ].
 ^ false.
 ! !
 !ListModelView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.117 2009-07-20 13:25:27 ca Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.118 2009-08-07 10:50:41 sr Exp $'
 ! !
 ListModelView initialize!

changeset 3728	8858b3571313
parent 3723	e3c5f00861e1
child 3891	0cce5a3615ee