hg/stx-libwidg2: comparison DSVColumnView.st

equal deleted inserted replaced

-:0bfbe5be0541
+:e63eb6f321e1
 sz := colDesc size.
 (sz == 0 or:[selectedColIndex ~~ 0]) ifTrue:[       "/ cell selected
 self deselect                                   "/ remove selection
 ].
+catchChangeEvents := true.
 sz ~~ 0 ifTrue:[
 id := 0.
 columnDescriptors := colDesc collect:[:aCol|
 ] ifFalse:[
 columnDescriptors := #()
 ].
 canFit := (columnDescriptors findFirst:[:aCol|aCol canResize]) ~~ 0.
 preferredExtent := nil.
-self preferredExtentChanged.
 shown ifTrue:[
 self fitColumns ifFalse:[
 self invalidate.
 self contentsChanged.
-]
+] ifTrue:[
-].
+self preferredExtentChanged.
+]
+].
+catchChangeEvents := false.
 self changed:#sizeOfColumns.
 !
 ^ self removeIndex:self size
 ! !
 !DSVColumnView methodsFor:'change & update'!
+changed:aParameter with:anArgument
+"notify all dependents that the receiver has changed somehow.
+Each dependent gets a  '#update:with:from:'-message, with aParameter
+and anArgument as arguments."
+catchChangeEvents ifTrue:[
+(    aParameter == #sizeOfColumns
+or:[aParameter == #columnsLayout]
+) ifTrue:[
+^ self
+]
+].
+super changed:aParameter with:anArgument
+!
 update:something with:aParameter from:changedObject
 "one of my rows/cells changed its value
 "
 |row|
 !
 redrawX:x y:y width:w height:h
 "redraw part of myself immediately, given logical coordinates
 "
-|c0 prevClipArea
+|c0 savClip
 start "{ Class:SmallInteger }"
 stop  "{ Class:SmallInteger }"
 x0    "{ Class:SmallInteger }"
 x1    "{ Class:SmallInteger }"
 maxX  "{ Class:SmallInteger }"
 times "{ Class:SmallInteger }"
 yMax  "{ Class:SmallInteger }"
 |
 shown ifFalse:[^ self].
 self paint:bgColor.
 self fillRectangleX:x y:y width:w height:h.
 columnDescriptors size ~~ 0 ifTrue:[
+savClip := clipRect.
+self clippingRectangle:(Rectangle left:x top:y width:w height:h).
 yTop  := margin - viewOrigin y.
 c0    := y - yTop max:0.
 start := (c0 // rowHeight) + 1.
 stop  := (c0 + h - 1 // rowHeight + 1) min:(list size).
 (times := stop - start + 1) > 0 ifTrue:[
-prevClipArea := clipRect.
-clipRect     := nil.
 maxX := (x + w) min:(width - margin).
 x0   := margin - viewOrigin x.
 yTop := yTop + ((start - 1) * rowHeight).
 yBot := yTop + (times * rowHeight).
 yMax := height - margin - margin.
 columnDescriptors do:[:aCol|
 x1 := x0 + aCol width.
 (x1 > x and:[x0 < maxX]) ifTrue:[
-c0 := (x1 min:maxX) - minX.
-device setClipX:minX y:margin width:c0 height:yMax in:drawableId gc:gcId.
 aCol drawFrom:start times:times x0:x0 yTop:yTop yBot:yBot with:fgColor and:bgColor.
 ].
 x0 := x1
-].
+]
-clipRect := nil.
+].
-prevClipArea isNil ifTrue:[device noClipIn:drawableId  gc:gcId]
+self clippingRectangle:savClip.
-ifFalse:[self clippingRectangle:prevClipArea].
+].
-]
-]
-"Modified: / 17.2.1998 / 18:04:15 / stefan"
 ! !
 !DSVColumnView methodsFor:'enumerating columns'!
 columnsDo:aOneArgBlock
 !
 fitColumns
 "fit columns to view
 "
-|lastColumn dX sz expand resizables deltaWidth|
+|raiseNotify lastColumn dX sz expand resizables deltaWidth|
 self canFit ifFalse:[^ false ].
-resizables        := 0.
+resizables  := 0.
-deltaWidth        := 0.
+deltaWidth  := 0.
-(catchChangeEvents := preferredExtent isNil) ifTrue:[
+preferredExtent isNil ifTrue:[
+raiseNotify := catchChangeEvents.
+catchChangeEvents := true.
 self preferredExtent.
+catchChangeEvents := raiseNotify.
+raiseNotify := raiseNotify not.
+] ifFalse:[
+raiseNotify := false
 ].
 self columnsDo:[:aCol|
 aCol canResize ifTrue:[
 resizables := resizables + 1.
 deltaWidth := width - sz + margin + margin
 ]
 ].
 deltaWidth == 0 ifTrue:[
-catchChangeEvents ifTrue:[
+raiseNotify ifTrue:[ self changed:#columnsLayout ].
-catchChangeEvents := false.
-self changed:#columnsLayout.
-].
 ^ false
 ].
 expand ifTrue:[
 (dX := deltaWidth // resizables) ~~ 0 ifTrue:[
 self columnsDo:[:aCol|aCol canResize ifTrue:[aCol growWidth:dX]]
 ].
 lastColumn growWidth:(deltaWidth - (dX * resizables)).
 ].
-catchChangeEvents := false.
 self preferredExtentChanged.
 shown ifTrue:[
 self invalidate.
 rowHeight := (rowHeight + separatorSize + verticalSpacing + verticalSpacing + 1) // 2 * 2.
 preferredExtent := (x + margin + margin) @ (self size * rowHeight).
 x := (rowHeight - separatorSize - font height) // 2 + font ascent.
 self columnsDo:[:aCol|aCol textInsetChanged:x].
+self changed:#columnsLayout.
-catchChangeEvents ifFalse:[
-self changed:#columnsLayout
-].
 ^ preferredExtent
 !
 ! !
 !DSVColumnView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.32 1998-04-01 14:08:19 ca Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.33 1998-04-14 13:36:18 ca Exp $'
 ! !

changeset 859	e63eb6f321e1
parent 833	c4e3e579f8bd
child 861	a227a3ca27e7