hg/stx-libwidg2: comparison DSVLabelView.st

equal deleted inserted replaced

-:6173137343de
+:3250a67fcce2
 	poolDictionaries:''
 	category:'Views-DataSet'
 !
 Object subclass:#Item
-	instanceVariableNames:'label selector argument isDrawable adjust font fgColor bgColor
+	instanceVariableNames:'label selector argument adjust font fgColor bgColor layout
-		layout preferredExtent'
+		preferredExtent'
 	classVariableNames:'DefaultLayout'
 	poolDictionaries:''
 	privateIn:DSVLabelView
 !
 savClip := clipRect.
 self clippingRectangle:(Rectangle left:x top:y width:w height:h).
 items do:[:anItem|
-anItem isDrawable ifTrue:[
+layout := anItem layout.
-layout := anItem layout.
+left   := layout left.
-left   := layout left.
+width  := layout width.
-width  := layout width.
+(left < maxX and:[layout right > x]) ifTrue:[
-(left < maxX and:[layout right > x]) ifTrue:[
+(bg := anItem backgroundColor) notNil ifTrue:[
-(bg := anItem backgroundColor) notNil ifTrue:[
+bg ~= bgColor ifTrue:[
-bg ~= bgColor ifTrue:[
+self paint:bg.
-self paint:bg.
+self fillRectangleX:left y:y width:width height:h.
-self fillRectangleX:left y:y width:width height:h.
+]
-]
+] ifFalse:[
-] ifFalse:[
+bg := bgColor
-bg := bgColor
+].
-].
+fg := (anItem foregroundColor) ? fgColor.
-fg := (anItem foregroundColor) ? fgColor.
+lv := selection == anItem ifTrue:[actLvl] ifFalse:[pasLvl].
-lv := selection == anItem ifTrue:[actLvl] ifFalse:[pasLvl].
+self paint:fg on:bg.
-self paint:fg on:bg.
+anItem redrawLabelOn:self hInset:inset + (lv abs).
-anItem redrawLabelOn:self hInset:inset + (lv abs).
+columnView drawEdgesAtX:left y:0 width:width height:height level:lv on:self
-columnView drawEdgesAtX:left y:0 width:width height:height level:lv on:self
-]
 ]
 ].
 self clippingRectangle:savClip.
 !
 columnsSizeChanged
 "the list of columns changed; recreate all items
 "
-|height font lastCol prevCol|
+|height font|
-items   := OrderedCollection new.
+items := OrderedCollection new.
-font    := columnView font.
-height  := 0.
+columnView numberOfColumns ~~ 0 ifTrue:[
+font   := columnView font.
-columnView numberOfColumns == 0 ifTrue:[
+height := 0.
-^ self redraw
-].
+columnView columnsDo:[:aColumn||item|
-lastCol := columnView lastColumn.
+items add:(item := Item column:aColumn font:font on:self).
-prevCol := nil.
+height := (item preferredExtent y) max:height.
+].
-columnView columnsDo:[:aColumn||item|
+height := height + self class verticalInset.
-items add:(item := Item column:aColumn font:font on:self).
+self updateLayoutsHeight:height.
+self bottomInset:height negated.
-item isDrawable ifTrue:[
+].
-height  := (item preferredExtent y) max:height.
-prevCol := aColumn showColSeparator ifTrue:[nil] ifFalse:[aColumn].
-] ifFalse:[
-prevCol isNil ifTrue:[
-(aColumn == lastCol or:[aColumn showColSeparator]) ifTrue:[
-prevCol := nil.
-item makeDrawable.
-]
-]
-]
-].
-height := height + self class verticalInset.
-self updateLayoutsHeight:height.
-self bottomInset:height negated.
 self redraw.
 ! !
 !DSVLabelView methodsFor:'private'!
 !
 updateLayoutsHeight:h
 "update the rectangle layout for each item based on a height
 "
-|idx x0 x1 x col|
+|i x w|
-idx := 1.
+i := 1.
-x1  := 0.
+x := columnView margin - columnView xOriginOfContents.
-x1  := columnView has3Dseparators ifTrue:[0] ifFalse:[1].
+columnView has3Dseparators ifFalse:[ x := x + 1].
-x0  := columnView margin - columnView xOriginOfContents.
-col := nil.
+columnView columnsDo:[:aCol|
+w := aCol width.
-columnView columnsDo:[:aCol||itm w|
+(items at:i) layout:(Rectangle origin:(x @ 0) extent:(w @ h)).
-w   := aCol width.
+i := i + 1.
-x1  := x1 + w.
+x := x + w.
-itm := items at:idx.
+].
-idx := idx + 1.
-(itm isDrawable or:[aCol showColSeparator]) ifTrue:[
-col notNil ifTrue:[
-itm isDrawable ifTrue:[
-x  := x1 - w.
-x1 := w.
-] ifFalse:[
-x  := x1.
-x1 := 0
-].
-col layout:(Rectangle origin:(x0 @ 0) extent:(x @ h)).
-x0  := x0 + x.
-col := nil.
-].
-itm isDrawable ifTrue:[
-col := itm.
-]
-]
-].
-col notNil ifTrue:[
-col layout:(Rectangle origin:(x0 @ 0) extent:(x1 @ h)).
-].
 ! !
 !DSVLabelView::Item class methodsFor:'constants'!
 defaultLayout
 selector        <Symbol>        a selector, which is evaluated with the argument
 if the item is selected and the button is released.
 argument        <Object>        user defined argument for the selector.
-isDrawable      <Boolean>       computed: is the label drawable
 adjust          <Symbol>        align label left, right or center; default is center
 font            <Font>          font used to dispaly the label; if the font is
 undefined, the default font is used.
 ! !
 !DSVLabelView::Item methodsFor:'actions'!
-makeDrawable
-"make the item drawable
-"
-isDrawable := true
-!
 sendClickMsgTo:aReceiver
 "inform the receiver of a button release notification
 "
 (aReceiver notNil and:[selector notNil]) ifTrue:[
 label    := aColumn label.
 selector := aColumn description labelActionSelector.
 argument := (aColumn description labelActionArgument) ? label.
-preferredExtent := 0 @ 0.
 adjust := aColumn labelAlignment.
 layout := self class defaultLayout.
 (fgColor := aColumn labelForegroundColor) notNil ifTrue:[
 fgColor := fgColor on:(aGC device)
 (img := label icon)  isImage ifTrue:[img clearMaskedPixels].
 ]
 ]
 ].
-label notNil ifTrue:[
+preferredExtent := label notNil ifTrue:[ Point x:(label widthOn:aGC) y:(label heightOn:aGC) ]
-preferredExtent := Point x:(label widthOn:aGC) y:(label heightOn:aGC).
+ifFalse:[ 0 @ 0 ].
-isDrawable := true.
-] ifFalse:[
-isDrawable := selector notNil
-]
 ! !
 !DSVLabelView::Item methodsFor:'notification'!
 ! !
 !DSVLabelView::Item methodsFor:'queries'!
-isDrawable
-"returns true if the item is drawble
-"
-^ isDrawable
-!
 isSelectable
 "returns true if the item is selectable; a valid selector
 to notify the receiver for a release button event exists
 "
 ! !
 !DSVLabelView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/DSVLabelView.st,v 1.15 1998-05-20 07:47:25 ca Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/DSVLabelView.st,v 1.16 1998-06-03 14:30:36 ca Exp $'
 ! !

changeset 907	3250a67fcce2
parent 893	7e52a293a3da
child 1085	cebea5318863