hg/stx-libwidg2: comparison DSVColumnView.st

equal deleted inserted replaced

-:64d52b8e3dbd
+:a227a3ca27e7
 add:aRow beforeIndex:aRowNr
 "add a new row before slot aRowNr and redisplay; returns nil in case
 of an invalid index or the row
 "
-|y0 y1 h dH|
+self addAll:(Array with:aRow) beforeIndex:aRowNr.
+^ aRow.
-list isNil ifTrue:[
+!
-list := OrderedCollection new.
-preferredExtent := nil.         "/ force a recomputation
+addAll:aList beforeIndex:start
+"add a collection of rows before slot start and redisplay
+"
+|y0 y1 yD h dH size noSel|
+(size := aList size) == 0 ifTrue:[
+^ self
+].
+self size == 0 ifTrue:[
+^ self list:aList
 ].
 beDependentOfRows ifTrue:[
-aRow notNil ifTrue:[aRow addDependent:self].
+aList do:[:aRow| aRow notNil ifTrue:[aRow addDependent:self]]
 ].
-list add:aRow beforeIndex:aRowNr.
+noSel := self numberOfSelections.
-self recomputeHeightOfContents.
+noSel ~~ 0 ifTrue:[
+multipleSelectOk ifFalse:[
-(y0 := self numberOfSelections) ~~ 0 ifTrue:[
+selectedRowIndex >= start ifTrue:[
-y0 == 1 ifTrue:[
+selectedRowIndex := selectedRowIndex + size
-(y0 := self firstIndexSelected) >= aRowNr ifTrue:[
+]
-y0 := y0 + 1.
+] ifTrue:[
-multipleSelectOk ifFalse:[
+1 to:noSel do:[:i||v|
-selectedRowIndex := y0
+(v := selectedRowIndex at:i) >= start ifTrue:[
-] ifTrue:[
+selectedRowIndex at:i put:(v + size)
-selectedRowIndex at:1 put:y0
 ]
 ]
-] ifFalse:[
+]
-self deselect
+].
-]
+list addAll:aList beforeIndex:start.
-].
+self recomputeHeightOfContents.
-y0 := (aRowNr - 1) * rowHeight.
+y0 := (start - 1) * rowHeight.
+yD := size * rowHeight.
+y1 := y0 + yD.
 y0 < viewOrigin y ifTrue:[
 self originWillChange.
-viewOrigin y:(rowHeight + viewOrigin y).
+viewOrigin y:(yD + viewOrigin y).
-self originChanged:(0 @ rowHeight).
+self originChanged:(0 @ yD).
 ].
-(shown not or:[self sensor hasDamageFor:self]) ifFalse:[
+(shown not or:[self sensor hasDamageFor:self]) ifTrue:[
-y0 := self yVisibleOfRowNr:aRowNr.
+^ self contentsChanged.
-y1 := y0 + rowHeight.
+].
-(y1 > margin and:[y0 < (h := height - margin)]) ifTrue:[
+y0 := self yVisibleOfRowNr:start.
-h  := h - y1.
+y1 := y0 + yD.
-y0 := y0 max:margin.
-dH := y1 - y0.
+(y1 > margin and:[y0 < (h := height - margin)]) ifTrue:[
-aRowNr == list size ifFalse:[
+h  := h - y1.
-self catchExpose.
+y0 := y0 max:margin.
+dH := y1 - y0.
-self copyFrom:self x:0 y:y0
-toX:0 y:y1
+start == list size ifFalse:[
-width:width height:h async:true.
+self catchExpose.
-self waitForExpose
+self copyFrom:self x:0 y:y0
-].
+toX:0 y:y1
-self redrawX:margin y:y0 width:width - margin - margin height:dH.
+width:width height:h async:true.
-]
+self waitForExpose
+].
+self redrawX:margin y:y0 width:width - margin - margin height:dH.
 ].
 self contentsChanged.
-^ aRow
-!
-addAll:aCollection beforeIndex:aRowNr
-"add a collection of rows before slot aRowNr and redisplay
-"
-aCollection size ~~ 0 ifTrue:[
-self size == 0 ifTrue:[
-^ self list:aCollection
-].
-aCollection reverseDo:[:aRow|
-self add:aRow beforeIndex:aRowNr
-]
-].
 !
 addFirst:aRow
 "insert a row at start
 "
 "remove first row; returns the removed row
 "
 self removeIndex:1
 !
-removeIndex:aRowNr
+removeFrom:startIndex to:stopIndex
-"remove row at an index; returns the removed row
+"remove rows from start to stop
 "
-|y0 y1 h dY oY yB noRedraw row|
+|coll noRedraw
+noSel "{ Class: SmallInteger }"
-row := list at:aRowNr ifAbsent:[^ self subscriptBoundsError:aRowNr].
+size  "{ Class: SmallInteger }"
+start "{ Class: SmallInteger }"
-(beDependentOfRows and:[row notNil]) ifTrue:[
+stop  "{ Class: SmallInteger }"
-row removeDependent:self
+y0    "{ Class: SmallInteger }"
-].
+y1    "{ Class: SmallInteger }"
+oY    "{ Class: SmallInteger }"
-(y0 := self numberOfSelections) ~~ 0 ifTrue:[
+dY    "{ Class: SmallInteger }"
-y0 == 1 ifTrue:[
+yB    "{ Class: SmallInteger }"
-(y0 := self firstIndexSelected) > aRowNr ifTrue:[
+h     "{ Class: SmallInteger }"
-y0 := y0 - 1.
+|
-multipleSelectOk ifFalse:[
-selectedRowIndex := y0
+(    (start := startIndex) < 1
-] ifTrue:[
+or:[(stop := stopIndex) > list size]
-selectedRowIndex at:1 put:y0
+) ifTrue:[
-]
+^ self subscriptBoundsError:start
-] ifFalse:[
+].
-y0 == aRowNr ifTrue:[
+size := stop - start + 1.
+beDependentOfRows ifTrue:[
+list from:start to:stop do:[:r| r notNil ifTrue:[r removeDependent:self]].
+].
+noSel := self numberOfSelections.
+noSel ~~ 0 ifTrue:[
+noSel == 1 ifTrue:[
+noSel := self firstIndexSelected.
+noSel < start ifFalse:[
+noSel > stop ifTrue:[
+noSel := noSel - size.
+multipleSelectOk ifFalse:[selectedRowIndex := noSel]
+ifTrue:[selectedRowIndex at:1 put:noSel]
+] ifFalse:[
 editValue notNil ifTrue:[
 editValue removeDependent:self.
 editValue := nil.
 ].
-self deselect
+self deselect.
 ]
 ]
 ] ifFalse:[
-self deselect
+coll := OrderedCollection new:noSel.
-]
-].
+selectedRowIndex do:[:i|
-y1 := aRowNr * rowHeight.
+i < start ifTrue:[
-y0 := y1 - rowHeight.
+coll add:i
+] ifFalse:[
+i > stop ifTrue:[
+coll add:(i - size)
+]
+]
+].
+coll size == 0 ifTrue:[
+self deselect
+] ifFalse:[
+selectedRowIndex := coll
+]
+]
+].
+list removeFrom:start to:stop.
+y0 := start - 1 * rowHeight.
+dY := size * rowHeight.
+y1 := dY + y0.
 yB := y1 + margin - viewOrigin y.
-list removeIndex:aRowNr.
 self recomputeHeightOfContents.
 y0 < (oY := viewOrigin y) ifTrue:[
 (noRedraw := y1 <= oY) ifFalse:[dY := y0 - oY]
-ifTrue:[dY := rowHeight negated].
+ifTrue:[dY := dY negated].
 self originWillChange.
 viewOrigin y:(dY + oY).
 self originChanged:(0 @ dY).
 ] ifFalse:[
 noRedraw := y0 > (height + viewOrigin y)
 ].
 (noRedraw or:[shown not]) ifFalse:[
 y1 := yB.
-y0 := self yVisibleOfRowNr:aRowNr.
+y0 := self yVisibleOfRowNr:start.
 h  := height - margin - yB.
 y0 := y0 max:margin.
 h > 0 ifTrue:[
 self catchExpose.
 ].
 y0 := y0 + h.
 self redrawX:margin y:y0 width:width - margin - margin height:(height - y0).
 ].
 self contentsChanged.
-^ row.
+!
+removeIndex:aRowNr
+"remove row at an index; returns the removed row
+"
+|row|
+row := list at:aRowNr ifAbsent:nil.
+self removeFrom:aRowNr to:aRowNr.
+^ row
 !
 removeLast
 "remove last row; the row is returned
 "
 ]
 ].
 selectedRowIndex add:(clickPosition := idx).
 scr == 0 ifTrue:[
-self redrawX:margin y:y width:width - margin - margin height:1
+self redrawRowAt:idx colAt:0.
 ] ifFalse:[
 self scrollTo:(viewOrigin + (0 @ scr)) redraw:true
 ].
 !
 self selectionChanged.
 ^ self sensor flushMotionEventsFor:self.
 ]
 ]
 ].
 (self canDrag and:[self isSelected:rowNr inColumn:colNr]) ifTrue:[
 clickPosition   := x @ y.
 dragAccessPoint := (colNr @ rowNr).
 ] ifFalse:[
 self selectRowAt:rowNr colAt:colNr atPoint:(x @ y)
 ! !
 !DSVColumnView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.33 1998-04-14 13:36:18 ca Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.34 1998-04-16 11:00:21 ca Exp $'
 ! !

changeset 861	a227a3ca27e7
parent 859	e63eb6f321e1
child 872	ad92183a6e6b