hg/stx-libwidg2: comparison DataSetColumn.st

equal deleted inserted replaced

-:c15c713b9df6
+:2d0b9fc2422c
 Object subclass:#DataSetColumn
 	instanceVariableNames:'columnNumber dataSet minWidth width description buttonExtent
-		drawableAction rendererType backgroundColor rowSeparatorSelector
+		drawableAction shownValue rendererType backgroundColor
-		showColSeparator showRowSeparator foregroundColor fgSelector
+		rowSeparatorSelector showColSeparator showRowSeparator
-		bgSelector columnAlignment label readSelector
+		foregroundColor fgSelector bgSelector columnAlignment label
-		numArgsToReadSelector columnAdaptor'
+		readSelector numArgsToReadSelector columnAdaptor'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Views-DataSet'
 !
 !
 width
 "returns the width in pixels
 "
-|end|
+|max w|
 width notNil ifTrue:[ ^ width ].                            "/ already computed
 (    (width := description width)    ~~ 0                   "/ fixed size
 or:[(width := description minWidth) ~~ 0]                  "/ start size
 ) ifFalse:[
 self containsText ifTrue:[
 "/ take maximum 10 entries to calculate the width;
 "/ can be resized later if neccessary
-end := 10 min:dataSet size.
+max := 10 min:dataSet size.
-1 to:end do:[:aRowNr||lbl|
+1 to:max do:[:i|
-lbl := drawableAction value:(dataSet at:aRowNr).
+w := self widthOfLabel:(shownValue value:(dataSet at:i)).
+width := width max:w
-(lbl respondsTo:#widthOn:) ifTrue:[
-width := width max:(lbl widthOn:dataSet)
-] ifFalse:[
-lbl notNil ifTrue:[
-width := width max:(lbl displayString widthOn:dataSet)
-]
-]
 ].
 description editorType ~~ #None ifTrue:[
 width := width + (dataSet font widthOn:dataSet device)
 ].
 ].
 width := width + buttonExtent x.
+width := width max:(4 + (label preferredExtent x)).
-label notNil ifTrue:[
-width := width max:(4 + (label widthOn:dataSet))
-]
 ].
 ^ width := minWidth := width + dataSet separatorSize + (2 * dataSet horizontalSpacing).
 !
 width:aWidth
 ].
 ! !
 !DataSetColumn methodsFor:'drawing'!
+drawLabel:aLabel atX:xLeft y:yTop
+"redraw label
+"
+|x space|
+space := dataSet horizontalSpacing.
+columnAlignment == #left ifTrue:[
+x  := xLeft + space.
+] ifFalse:[
+x := width - (aLabel widthOn:dataSet).
+columnAlignment == #right ifTrue:[x := x - space]
+ifFalse:[x := x // 2].
+x := (xLeft + x) max:0.
+].
+aLabel isImageOrForm ifTrue:[
+aLabel displayOn:dataSet x:x y:yTop.
+^ self
+].
+aLabel displayOn:dataSet x:x y:(yTop + dataSet rowFontAscent)
+!
 drawLabelsAtX:xLeft y:yTop h:h from:start to:stop
 "redraw labels from start to stop
 "
 |fg bg label row isSel
 y       "{ Class:SmallInteger }"
 yT      "{ Class:SmallInteger }"
 x       "{ Class:SmallInteger }"
 hspace  "{ Class:SmallInteger }"
 ascent  "{ Class:SmallInteger }"
+lblHg   "{ Class:SmallInteger }"
 |
 yT := yTop.
 ascent := dataSet rowFontAscent.
 hspace := dataSet horizontalSpacing.
 x  := x + hspace.
 ] ifFalse:[
 label := nil
 ]
 ] ifFalse:[
-(label := drawableAction value:row) notNil ifTrue:[
+(isSel and:[dataSet hasOpenEditor]) ifTrue:[
-columnAlignment == #left ifTrue:[
+label := nil
-x  := x + hspace.
+]  ifFalse:[
-] ifFalse:[
+label := shownValue value:row
-x := width - (label widthOn:dataSet).
-columnAlignment == #right ifTrue:[x := x - hspace]
-ifFalse:[x := x // 2].
-x := (xLeft + x) max:0.
-]
 ]
 ].
 label notNil ifTrue:[
-y := y + (h - (label heightOn:dataSet) // 2).
+lblHg := self heightOfLabel:label.
-label isImageOrForm ifFalse:[
+lblHg ~~ 0 ifTrue:[
-y := y + ascent
+y := y + (h - lblHg // 2).
-].
+dataSet paint:fg on:bg.
-dataSet paint:fg on:bg.
-label displayOn:dataSet x:x y:y
+(label isSequenceable and:[label isString not]) ifFalse:[
+self drawLabel:label atX:x y:y
+] ifTrue:[
+label do:[:el|
+el notNil ifTrue:[
+self drawLabel:el atX:x y:y.
+y := y + (el heightOn:dataSet).
+]
+]
+].
+]
 ].
 yT := yT + h
 ]
 showRowSeparator ifTrue:[
 "/ DRAW SEPARATORS AT TOP( LIGHT COLOR )
 "/ =====================================
 yT := yTop.
-xR := xR - 1.
 rowSeparatorSelector isNil ifTrue:[
 times timesRepeat:[
 dataSet displayLineFromX:xL y:yT toX:xR y:yT.
 yT := yT + h.
 ! !
 !DataSetColumn methodsFor:'editing'!
 editorAt:aRowNr
-|val row|
+|val row index|
 row := (dataSet at:aRowNr).
 val := self extractColFromRow:row.
 val isText ifTrue:[val := val string].
 ^ description editorOn:row value:val.
 ! !
 !DataSetColumn methodsFor:'event handling'!
 ! !
 !DataSetColumn methodsFor:'initialization'!
-on:aDSVColumnView description:aDescription columnNumber:aNumber
+on:aDSVColumnView description:aDescription columnNumber:aNumber label:aLabel
 "instance creation; set attributes dependent on the description
 "
 |device selector format idx type oldFont newFont args|
 columnNumber     := aNumber.
 dataSet          := aDSVColumnView.
+label            := aLabel.
 description      := aDescription.
 rendererType     := description rendererType.
 width            := nil.
 device           := dataSet device.
-drawableAction   := [:aRow| nil ].
+shownValue       := [:aRow| nil ].
 rowSeparatorSelector := description rowSeparatorSelector.
 fgSelector       := description foregroundSelector.
 bgSelector       := description backgroundSelector.
 showColSeparator := description showColSeparator.
 showRowSeparator := description showRowSeparator.
 foregroundColor := dataSet foregroundColor
 ] ifFalse:[
 foregroundColor := foregroundColor on:dataSet device
 ].
-oldFont := nil.
-label   := self resolveLabelWithBuilder:(dataSet builder).
-(label respondsTo:#string) ifTrue:[
-"/
-"/ must set the font to accumulate the real extent of a string label
-"/
-(label isString and:[label isEmpty]) ifTrue:[
-label := nil
-] ifFalse:[
-(newFont := description labelFont) notNil ifTrue:[
-oldFont := dataSet font.
-dataSet font:newFont.
-]
-]
-].
-oldFont notNil ifTrue:[
-dataSet font:oldFont
-].
 rendererType == #CheckToggle ifTrue:[
 buttonExtent := dataSet checkToggleExtent.
 ^ self
 ].
 selector := description printSelector.
 selector notNil ifTrue:[
 args := selector numArgs.
 args == 0 ifTrue:[
-drawableAction := [:aRow| aRow perform:selector ]
+shownValue := [:aRow| aRow perform:selector ]
 ] ifFalse:[
 args == 1 ifTrue:[
-drawableAction := [:aRow| aRow perform:selector with:dataSet ]
+shownValue := [:aRow| aRow perform:selector with:dataSet ]
 ] ifFalse:[
-drawableAction := [:aRow| aRow perform:selector with:dataSet with:columnNumber ]
+shownValue := [:aRow| aRow perform:selector with:dataSet with:columnNumber ]
 ]
 ].
 ^ self
 ].
 (idx := format indexOf:$.) ~~ 0 ifTrue:[
 idx := format size - idx
 ].
 format := '%0.', idx printString, 'f'.
-drawableAction := [:aRow||n|
+shownValue := [:aRow||n|
 n := self extractColFromRow:aRow.
 n isReal ifTrue:[n := n asFloat printfPrintString:format].
 n
 ]
 ] ifFalse:[         "/ default: no format string
-drawableAction := [:aRow| self extractColFromRow:aRow ]
+shownValue := [:aRow| self extractColFromRow:aRow ]
 ]
-!
-resolveLabelWithBuilder:aBuilder
-|label appl l2|
-aBuilder isNil ifTrue:[
-^ description rawLabel
-].
-(label := description label) isString ifTrue:[
-description labelIsImage ifTrue:[
-aBuilder isEditing ifTrue:[
-label := nil
-] ifFalse:[
-(label := aBuilder labelFor:(label asSymbol)) notNil ifTrue:[
-^ label
-]
-].
-^ description class defaultIcon
-].
-description translateLabel == true ifTrue:[
-(appl := aBuilder application) notNil ifTrue:[
-(l2 := appl resources string:label) notNil ifTrue:[^ l2]
-]
-]
-].
-^ label
 ! !
 !DataSetColumn methodsFor:'private'!
 extractColFromRow:aRow
 self containsText ifTrue:[
 "/ search first none empty drawable object
 end := 10 min:dataSet size.
 1 to:end do:[:aRowNr| |lbl|
-lbl := drawableAction value:(dataSet at:aRowNr).
+lbl  := shownValue value:(dataSet at:aRowNr).
+hObj := self heightOfLabel:(shownValue value:(dataSet at:aRowNr)).
-lbl notNil ifTrue:[
+hMin := hMin max:hObj
-(lbl respondsTo:#heightOn:) ifTrue:[
-hObj := lbl heightOn:dataSet
-] ifFalse:[
-hObj := lbl displayString heightOn:dataSet
-].
-^ hMin max:hObj
-]
 ]
 ]
 ].
 ^ hMin max:hObj.
+!
+heightOfLabel:aLabel
+"returns the height of the label
+"
+|h l|
+aLabel isNil ifTrue:[ ^ 0 ].
+(aLabel isSequenceable and:[aLabel isString not]) ifFalse:[
+(aLabel respondsTo:#heightOn:) ifTrue:[l := aLabel]
+ifFalse:[l := aLabel displayString].
+^ l heightOn:dataSet
+].
+h := 0.
+aLabel do:[:el|
+(el respondsTo:#heightOn:) ifTrue:[l := el]
+ifFalse:[l := el displayString].
+h := h + (el heightOn:dataSet)
+].
+^ h
+!
+heightOfLabelAt:aRowNr
+"returns the height of the label at a row in pixels
+"
+^ self heightOfLabel:(shownValue value:(dataSet at:aRowNr)).
 !
 showColSeparator
 "returns true if column separator is on
 "
 showSelectionHighLighted
 "returns true if selection is highLighted
 "
 ^ description showSelectionHighLighted ~~ false
+!
+widthOfLabel:aLabel
+"returns the width of the label
+"
+|w l|
+aLabel isNil ifTrue:[ ^ 0 ].
+(aLabel isSequenceable and:[aLabel isString not]) ifFalse:[
+(aLabel respondsTo:#widthOn:) ifTrue:[l := aLabel]
+ifFalse:[l := aLabel displayString].
+^ l widthOn:dataSet
+].
+w := 0.
+aLabel do:[:el|
+(el respondsTo:#widthOn:) ifTrue:[l := el]
+ifFalse:[l := el displayString].
+w := w max:(el widthOn:dataSet)
+].
+^ w
 ! !
 !DataSetColumn methodsFor:'searching'!
 findRowNrStartingWithChar:aChar start:start stop:stop
 self containsText ifTrue:[
 char  := aChar asLowercase.
 start to:stop do:[:aRowNr| |lbl|
-lbl := drawableAction value:(dataSet at:aRowNr).
+lbl := shownValue value:(dataSet at:aRowNr).
+(lbl isSequenceable and:[lbl isString not]) ifTrue:[
+lbl := lbl at:1 ifAbsent:nil
+].
 (lbl respondsTo:#string) ifTrue:[
 lbl := lbl string.
 (lbl size ~~ 0 and:[(lbl at:1) asLowercase == char]) ifTrue:[
 ^ aRowNr
 ! !
 !DataSetColumn class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/DataSetColumn.st,v 1.36 1998-09-12 12:43:37 ca Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/DataSetColumn.st,v 1.37 1998-09-25 15:01:16 cg Exp $'
 ! !

changeset 1147	2d0b9fc2422c
parent 1133	619b0afc557a
child 1186	8da80b8ed338