hg/stx-libwidg2: comparison DSVColumnView.st

equal deleted inserted replaced

-:dd55d01efdd7
+:376515452be4
 		catchChangeEvents beDependentOfRows bgColor hgLgFgColor
 		hgLgBgColor actionBlock builder doubleClickActionBlock
 		verticalSpacing horizontalSpacing rowSelectorForm
 		buttonLightColor buttonShadowColor buttonHalfLightColor
 		buttonHalfShadowColor checkToggleExtent checkToggleForm
-		checkToggleLevel comboButtonExtent comboButtonForm
+		checkToggleActiveImage checkTogglePassiveImage checkToggleLevel
-		comboButtonLevel clickPosition dragAccessPoint dragIsActive
+		comboButtonExtent comboButtonForm comboButtonLevel clickPosition
-		dropTarget dropSource columnAdaptor dataSetView'
+		dragAccessPoint dragIsActive dropTarget dropSource columnAdaptor
+		dataSetView'
 	classVariableNames:'DefaultForegroundColor DefaultBackgroundColor
 		DefaultHilightForegroundColor DefaultHilightBackgroundColor
 		RowSelector ButtonLightColor ButtonShadowColor
+		CheckToggleActiveImage CheckTogglePassiveImage
 		ButtonHalfLightColor ButtonHalfShadowColor ButtonEdgeStyle'
 	poolDictionaries:''
 	category:'Views-DataSet'
 !
 DefaultHilightBackgroundColor := StyleSheet colorAt:'selection.hilightBackgroundColor' default:DefaultForegroundColor.
 DefaultHilightForegroundColor = DefaultHilightBackgroundColor ifTrue:[
 DefaultHilightBackgroundColor := Color black
 ].
-ButtonLightColor      := StyleSheet colorAt:'button.lightColor'.
+ButtonLightColor       := StyleSheet colorAt:'button.lightColor'.
-ButtonShadowColor     := StyleSheet colorAt:'button.shadowColor'.
+ButtonShadowColor      := StyleSheet colorAt:'button.shadowColor'.
-ButtonHalfLightColor  := StyleSheet colorAt:'button.halfLightColor'.
+ButtonHalfLightColor   := StyleSheet colorAt:'button.halfLightColor'.
-ButtonHalfShadowColor := StyleSheet colorAt:'button.halfShadowColor'.
+ButtonHalfShadowColor  := StyleSheet colorAt:'button.halfShadowColor'.
-ButtonEdgeStyle       := StyleSheet at:'button.edgeStyle'.
+ButtonEdgeStyle        := StyleSheet at:'button.edgeStyle'.
+CheckToggleActiveImage := StyleSheet at:'checkToggle.activeImage'.
+CheckToggleActiveImage isNil ifTrue:[
+CheckTogglePassiveImage := nil
+] ifFalse:[
+CheckTogglePassiveImage := StyleSheet at:'checkToggle.passiveImage'.
+CheckTogglePassiveImage isNil ifTrue:[
+CheckToggleActiveImage := nil
+]
+].
 "
 self updateStyleCache.
 "
 ! !
 !DSVColumnView methodsFor:'accessing interactors'!
+checkToggleActiveImage
+^ checkToggleActiveImage
+!
 checkToggleExtent
 "returns the extent of a checkToggle
 "
 ^ checkToggleExtent
 !
 checkToggleLevel
 "returns the level of a checkToggle button
 "
 ^ checkToggleLevel
+!
+checkTogglePassiveImage
+^ checkTogglePassiveImage
 !
 comboButtonExtent
 "returns the extent of a comboList or -Box
 "
 ^ col
 ].
 ^ bgColor
 !
-drawEdgesAtX:x y:y width:w height:h level:aLevel
+drawButtonAt:x y:y width:w height:h level:aLevel rownNumber:aRowNr
-"draw edges
+"draw a button
 "
-self drawEdgesAtX:x y:y width:w height:h level:aLevel on:self
+(self isRowSelected:aRowNr) ifTrue:[
+self paint:bgColor.
+self fillRectangleX:x y:y width:w height:h.
+].
+self drawEdgesAtX:x y:y width:w height:h level:aLevel on:self.
+self paint:fgColor on:bgColor.
 !
 drawEdgesAtX:x y:y width:w height:h level:aLevel on:aGC
 "draw edges
 "
 x0 := x1
 ].
 self clippingRectangle:savClip.
 ]
 ].
-!
-setFgBgPaintFor:aRowNr
-(self isRowSelected:aRowNr) ifFalse:[self paint:fgColor     on:bgColor]
-ifTrue:[self paint:hgLgFgColor on:hgLgBgColor].
 ! !
 !DSVColumnView methodsFor:'enumerating columns'!
 columnsDo:aOneArgBlock
 ! !
 !DSVColumnView methodsFor:'gc operations'!
+imageOnDevice:anImage
+"associate image to device and clear pixel mask; returns the new image.
+"
+|image|
+(image := anImage) notNil ifTrue:[
+image device ~~ device ifTrue:[
+image := image copy.
+].
+image := image on:device.
+image isImage ifTrue:[
+image := image clearMaskedPixels
+]
+].
+^ image
+!
 registerImage:anImage key:aKey
 "any row can register an image with a unique identifier a key symbol
 "
 |img|
 (img := registererImages at:aKey ifAbsent:nil) notNil ifTrue:[
 ^ img
 ].
-img := anImage onDevice:device.
+img := self imageOnDevice:img.
-img clearMaskedPixels.
 registererImages at:aKey put:img.
 ^ img
 !
 registeredImageAt:aKey
 ].
 buttonHalfLightColor notNil ifTrue:[
 buttonHalfLightColor := buttonHalfLightColor on:device
 ].
+rowSelectorForm         := self imageOnDevice:rowSelectorForm.
+checkToggleActiveImage  := self imageOnDevice:checkToggleActiveImage.
+checkTogglePassiveImage := self imageOnDevice:checkTogglePassiveImage.
+comboButtonForm         := self imageOnDevice:comboButtonForm.
+checkToggleForm         := self imageOnDevice:checkToggleForm.
 !
 destroy
 "remove dependencies
 "
 !
 initStyle
 "setup colors
 "
-|v b|
+|button widget|
 super initStyle.
 DefaultForegroundColor isNil ifTrue:[
 self class updateStyleCache
 buttonHalfShadowColor isNil ifTrue:[
 buttonHalfShadowColor := buttonShadowColor lightened
 ]
 ].
-rowSelectorForm := (self class rowSelector) on:device.
+rowSelectorForm         := self class rowSelector.
+checkToggleActiveImage  := CheckToggleActiveImage.
-v := ComboBoxView new.
+checkTogglePassiveImage := CheckTogglePassiveImage.
-b := v menuButton.
+widget            := ComboListView new.
-(comboButtonForm := b label) isImage ifTrue:[
+button            := widget menuButton.
-comboButtonForm clearMaskedPixels
+comboButtonForm   := button label.
-].
+comboButtonLevel  := button offLevel.
+comboButtonExtent := (button preferredExtent x) @ (widget preferredExtent y).
-comboButtonLevel  := b offLevel.
-comboButtonExtent := (b preferredExtent x) @ (v preferredExtent y).
+widget            := CheckToggle new.
+checkToggleForm   := widget label.
-b := CheckToggle new.
+checkToggleLevel  := widget offLevel.
+checkToggleExtent := widget preferredExtent.
-(checkToggleForm := CheckToggle checkFormOn:device) isImage ifTrue:[
-checkToggleForm clearMaskedPixels
-].
-checkToggleLevel  := b offLevel.
-checkToggleExtent := b preferredExtent.
 ! !
 !DSVColumnView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.50 1998-08-24 05:23:38 ca Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.51 1998-08-29 13:47:49 ca Exp $'
 ! !

changeset 1100	376515452be4
parent 1089	931865a72ba7
child 1109	b97053dce48c