hg/stx-libwidg2: comparison DSVColumnView.st

equal deleted inserted replaced

-:7e8fae56b94c
+:bf718db445b5
 		checkToggleActiveImage checkTogglePassiveImage checkToggleLevel
 		comboButtonExtent comboButtonForm comboButtonLevel dropSource
 		columnAdaptor tabAtEndAction tabAtStartAction modifiedChannel
 		autoScroll autoScrollBlock needFitColumns scrollWhenUpdating
 		separatorOneDColor selectionForegroundColor
-		selectionBackgroundColor previousExtent selectConditionBlock
+		selectionForegroundColorNoFocus selectionBackgroundColor
-		scrollRowWise autoScrollToColumn'
+		selectionBackgroundColorNoFocus previousExtent
+		selectConditionBlock scrollRowWise autoScrollToColumn'
 	classVariableNames:'DefaultForegroundColor DefaultBackgroundColor
 		DefaultHilightForegroundColor DefaultHilightBackgroundColor
 		ButtonLightColor ButtonShadowColor CheckToggleActiveImage
 		CheckTogglePassiveImage ButtonHalfLightColor
 		ButtonHalfShadowColor ButtonEdgeStyle CheckToggleForm
 !
 selectionBackgroundColor
 "returns the background color of a selected row"
-^ selectionBackgroundColor
+self hasFocus ifTrue:[
+^ selectionBackgroundColor
+].
+^ selectionBackgroundColorNoFocus.
 !
 selectionForegroundColor
 "returns the foreground color of a selected row"
-^ selectionForegroundColor
+self hasFocus ifTrue:[
+^ selectionForegroundColor
+].
+^ selectionForegroundColorNoFocus.
 !
 separatorDarkColor
 "returns the dark color used for drawing a shadowed separator (3D)"
 y0 < y1 ifTrue:[
 self invalidateX:margin y:y0 width:width height:(y1 - y0)
 ]
 ]
+]
+!
+invalidateSelection
+shown ifTrue:[ |colIndex|
+colIndex := self selectedColIndex ? 0.
+self selectionIndicesDo:[:aRowIndex|
+self invalidateRowAt:aRowIndex colAt:colIndex.
+].
 ]
 !
 invalidateVisibleRow:aRow
 "redraw row if visible"
 ^ editView isNil
 ].
 ^ false
 !
+showFocus:explicit
+self invalidateSelection.
+super showFocus:explicit
+!
+showNoFocus:explicit
+self invalidateSelection.
+super showNoFocus:explicit
+!
 wantsFocusWithPointerEnter
 "views which like to take the keyboard focus
 when the pointer enters can do so by redefining this
 to return true"
 fgColor     := fgColor     onDevice:device.
 bgColor     := bgColor     onDevice:device.
 selectionForegroundColor := selectionForegroundColor onDevice:device.
 selectionBackgroundColor := selectionBackgroundColor onDevice:device.
+selectionForegroundColorNoFocus := selectionForegroundColorNoFocus onDevice:device.
+selectionBackgroundColorNoFocus := selectionBackgroundColorNoFocus onDevice:device.
 buttonShadowColor := buttonShadowColor onDevice:device.
 buttonLightColor  := buttonLightColor onDevice:device.
 buttonHalfShadowColor notNil ifTrue:[
 ]
 ].
 buttonHalfShadowColor isNil ifTrue:[
 buttonHalfShadowColor := Color gray
+].
+selectionForegroundColorNoFocus isNil ifTrue:[
+selectionForegroundColorNoFocus := selectionForegroundColor.
+].
+selectionBackgroundColorNoFocus isNil ifTrue:[
+selectionBackgroundColorNoFocus := selectionBackgroundColor lightened.
 ].
 rowSelectorForm         := self class rowSelectorImage.
 checkToggleActiveImage  := CheckToggleActiveImage.
 checkTogglePassiveImage := CheckTogglePassiveImage.
 ! !
 !DSVColumnView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.217 2006-10-23 08:56:12 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.218 2006-11-07 16:22:02 ca Exp $'
 ! !

changeset 3138	bf718db445b5
parent 3130	30ac624dd866
child 3140	6f2bc099fb35