hg/stx-libwidg2: comparison DSVColumnView.st

equal deleted inserted replaced

-:2b5746c733f6
+:8e97cbfebe12
 View subclass:#DSVColumnView
 	instanceVariableNames:'editValue editView multipleSelectOk selectedColIndex
 		selectedRowIndex rowHeight columnDescriptors viewOrigin colorMap
-		lockRowIndex rowIfAbsentBlock columnHolder registererImages list
+		rowFontAscent lockRowIndex rowIfAbsentBlock columnHolder
-		fgColor canFit separatorSize catchChangeEvents beDependentOfRows
+		registererImages list fgColor canFit separatorSize
-		bgColor hgLgFgColor hgLgBgColor actionBlock builder
+		catchChangeEvents beDependentOfRows bgColor hgLgFgColor
-		doubleClickActionBlock verticalSpacing horizontalSpacing
+		hgLgBgColor actionBlock builder doubleClickActionBlock
-		rowSelectorForm buttonLightColor buttonShadowColor
+		verticalSpacing horizontalSpacing rowSelectorForm
-		buttonHalfLightColor buttonHalfShadowColor checkToggleExtent
+		buttonLightColor buttonShadowColor buttonHalfLightColor
-		checkToggleForm checkToggleLevel comboButtonExtent
+		buttonHalfShadowColor checkToggleExtent checkToggleForm
-		comboButtonForm comboButtonLevel clickPosition dragAccessPoint
+		checkToggleLevel comboButtonExtent comboButtonForm
-		dragIsActive dropTarget dropSource columnAdaptor dataSetView'
+		comboButtonLevel clickPosition dragAccessPoint dragIsActive
+		dropTarget dropSource columnAdaptor dataSetView'
 	classVariableNames:'DefaultForegroundColor DefaultBackgroundColor
 		DefaultHilightForegroundColor DefaultHilightBackgroundColor
 		RowSelector ButtonLightColor ButtonShadowColor
 		ButtonHalfLightColor ButtonHalfShadowColor ButtonEdgeStyle'
 	poolDictionaries:''
 "
 implements a scrollable selection view based on rows and columns
 [Instance variables:]
+dataSetView             <DataSetView>           parent view
 editValue               <Model>                 current editing model
 editView                <View>                  current editing component
+multipleSelectOk        <Boolean>               multiple selection enabled/disabled
 selectedColIndex        <Integer>               selected column index or 0
-selectedRowIndex        <Integer>               selected row index or 0
+selectedRowIndex        <Integer>               selected row    index or 0
 rowHeight               <Integer>               maximum height of any row
 columnDescriptors       <SequancableCollection> list of column descriptors
+viewOrigin              <Point>                 current view origin
+colorMap                <Dictionary>            store and register used colors on device
+rowFontAscent           <SmallInteger>          inset of a printable text in a row
+including separator and font ascent.
+lockRowIndex            <SmallInteger>          internal used to indicate a row which has
+changed its contents but no redraw should be
+done( at:put: ).
+columnHolder            <ValueHolder>           holder which keeps the list of column descriptors.
+registererImages        <IdentityDictionary>    list of images registered on the device
 list                    <SequancableCollection> list of rows
-fgColor                 <Color>                 foreground color
-registererImages        <IdentityDictionary>    list of images registered on the device
+canFit                  <Boolean>               boolean set to true if colums can be fit to view
-beDependentOfRows       <Coolean>               keep rows dependent; on default is disabled.
+catchChangeEvents       <Boolean>               internal used to discard change notifications
+beDependentOfRows       <Boolean>               keep rows dependent; on default is disabled.
 in case of enabled a row can raise a change
 notification whithout a parameter which
 will force a redraw of the row or the
 readSelector of the column which will
 redraw the cell in the row only.
+fgColor                 <Color>                 foreground color
+bgColor                 <Color>                 background color
+hgLgFgColor             <Color>                 highlight foreground color (selected)
+hgLgBgColor             <Color>                 highlight background color (selected)
+buttonLightColor        <Color>                 LightColor      ( drawing the edge of a button )
+buttonShadowColor       <Color>                 ShadowColor     ( drawing the edge of a button )
+buttonHalfLightColor    <Color>                 HalfLightColor  ( drawing the edge of a button )
+buttonHalfShadowColor   <Color>                 HalfShadowColor ( drawing the edge of a button )
+actionBlock             <a OneArgBlock>         action block performed on select
+doubleClickActionBlock  <a OneArgBlock>         action block performed on double click
+rowIfAbsentBlock        <a OneArgBlock>         this block is performed on an emty list entry
+to retrive the item from the application. The
+argument to the block is the index into the list.
+The block should return the row instance which
+is put to the list under the index.
+builder                 <UIBuilder>             builder set by application
+verticalSpacing         <SmallInteger>          vertical   row spacing( top  & bottom )
+horizontalSpacing       <SmallInteger>          horizontal row spacing( left & right )
+separatorSize           <SmallInteger>          line width of a vertical or horizontal separator
+rowSelectorForm         <Form>                  form used by a row selector
+checkToggleForm         <Form>                  form used by a checkToggle
+checkToggleExtent       <Point>                 extent of a checkToggle
+checkToggleLevel        <SmallInteger>          level used to draw a check toggle
+comboButtonForm         <Form>                  form used by a comboList or -Box
+comboButtonExtent       <Point>                 extent of a comboList or -Box
+comboButtonLevel        <SmallInteger>          level used to draw a comboList or -Box
+clickPosition           <Point>                 click position of the mouse
+dragAccessPoint         <Point>                 point where the drag operation starts
+dragIsActive            <Boolean>               true if a drag operation is active
+dropTarget              <DropTarget>            drag & drop target
+dropSource              <DropSource>            drag & drop source
 [author:]
 Claus Atzkern
 [see also:]
 DataSetColumnSpec
 ifAbsentPut:[(Depth2Image new) width: 8; height: 11; photometric:(#palette); bitsPerSample:(#(2 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@P@AP@GPUWQ]7W]5W]"AX@F@@ @@@@@a') ; colorMapFromArray:#[0 0 0 255 255 255 127 127 127 170 170 170]; mask:((Depth1Image new) width: 8; height: 11; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'DA \?/????8\FA@b') ; yourself); yourself]! !
 !DSVColumnView class methodsFor:'defaults'!
 horizontalSpacing
+"returns the default horizontal space between rows
+"
 ^ 4
 !
 updateStyleCache
 "Modified: / 26.10.1997 / 17:09:07 / cg"
 !
 verticalSpacing
+"returns the default vertical space between rows
+"
 ^ 2
 ! !
 !DSVColumnView class methodsFor:'resources'!
 ifAbsentPut:[(Depth1Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@O?<0@C??L@@??30@O?<<@C??@@@??0@@O???@C???0@???<@O???@C???0@???<@O???@C???0@???<@O???@C???0@???<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@@@@@@@@@@@O??<@C???@@???<@O???@C???<@????@O???<C????@????0O???<C????@????0O???<C????@????0O???<C????@????0O???<C????@????0O???<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') ; yourself); yourself]! !
 !DSVColumnView methodsFor:'accessing'!
 builder
+"get the builder (UIBuilder or nil)
+"
 ^ builder
 !
 builder:aBuilder
+"set the builder (UIBuilder or nil)
+"
 builder := aBuilder
 !
 columnView
+"returns self
+"
 ^ self
 !
 dataSetView
 "return the value of the instance variable 'dataSetView' (automatically generated)"
 "set the value of the instance variable 'dataSetView' (automatically generated)"
 dataSetView := something.
 "Created: / 7.8.1998 / 22:13:43 / cg"
+!
+rowFontAscent
+"returns the inset of a printable text in a row
+"
+^ rowFontAscent
 ! !
 !DSVColumnView methodsFor:'accessing actions'!
 action:aOneArgAction
 ! !
 !DSVColumnView methodsFor:'accessing interactors'!
 checkToggleExtent
+"returns the extent of a checkToggle
+"
 ^ checkToggleExtent
 !
 checkToggleForm
+"returns the form of a checkToggle
+"
 ^ checkToggleForm
 !
 checkToggleLevel
+"returns the level of a checkToggle button
+"
 ^ checkToggleLevel
 !
 comboButtonExtent
+"returns the extent of a comboList or -Box
+"
 ^ comboButtonExtent
 !
 comboButtonForm
+"returns the form of a comboList or -Box
+"
 ^ comboButtonForm
 !
 comboButtonLevel
+"returns the level of a comboList or -Box button
+"
 ^ comboButtonLevel
 !
 rowSelectorExtent
 "returns the bitmap of a selected row
 !
 rowSelectorForm
 "returns the bitmap of a selected row
 "
-rowSelectorForm isNil ifTrue:[
-rowSelectorForm := (self class rowSelector) on:device
-].
 ^ rowSelectorForm
 ! !
 !DSVColumnView methodsFor:'accessing mvc'!
 "set the value of the instance variable 'columnAdaptor' (automatically generated)"
 columnAdaptor := something.!
 columnHolder
+"get the valueHolder, which keeps the list of column descriptions
+"
 ^ columnHolder
 !
 columnHolder:aValueHolder
+"set the valueHolder, which keeps the list of column descriptions
+"
 |columns|
 columnHolder notNil ifTrue:[
 columnHolder removeDependent:self
 ].
 x0    "{ Class:SmallInteger }"
 x1    "{ Class:SmallInteger }"
 maxX  "{ Class:SmallInteger }"
 minX  "{ Class:SmallInteger }"
 yTop  "{ Class:SmallInteger }"
-yBot  "{ Class:SmallInteger }"
-times "{ Class:SmallInteger }"
 yMax  "{ Class:SmallInteger }"
 |
 shown ifFalse:[^ self].
 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:[
+stop >= start ifTrue:[
 savClip := clipRect.
 maxX := (x + w) min:(width - margin).
 x0   := margin - viewOrigin x.
 yTop := yTop + ((start - 1) * rowHeight).
-yBot := yTop + (times * rowHeight).
 yMax := height - margin - margin.
 minX := x max:margin.
 columnDescriptors do:[:aCol||rW|
 x1 := x0 + aCol width.
 (x1 > x and:[x0 < maxX]) ifTrue:[
 rW := (x1 min:maxX) - x.
 self clippingRectangle:(Rectangle left:x top:y width:rW height:h).
-aCol drawFrom:start times:times x0:x0 yTop:yTop yBot:yBot with:fgColor and:bgColor.
+aCol redrawX:x0 y:yTop from:start to:stop with:fgColor and:bgColor.
 ].
 x0 := x1
 ].
 self clippingRectangle:savClip.
 ]
 buttonHalfShadowColor isNil ifTrue:[
 buttonHalfShadowColor := buttonShadowColor lightened
 ]
 ].
+rowSelectorForm := (self class rowSelector) on:device.
 v := ComboBoxView new.
 b := v menuButton.
 (comboButtonForm := b label) isImage ifTrue:[
 verticalSpacing   := self class verticalSpacing.
 horizontalSpacing := self class horizontalSpacing.
 colorMap          := Dictionary new.
 catchChangeEvents := false.
 dragIsActive      := false.
+rowFontAscent     := 0.             "/ dummy initialization
 self lineWidth:0.
 !
 mapped
 "set selection if exists after mapping
 ! !
 !DSVColumnView methodsFor:'private'!
 detectViewAt:aPoint in:aView
+"returns the view at a point
+"
 |p|
 (aView notNil and:[aView subViews notNil]) ifTrue:[
 aView subViews do:[:sv|
 p := device translatePoint:aPoint from:(self id) to:(sv id).
 x := x + (aCol minWidth).
 ].
 rowHeight := (rowHeight + separatorSize + verticalSpacing + verticalSpacing + 1) // 2 * 2.
 preferredExtent := (x + margin + margin) @ (self size * rowHeight).
-x := (rowHeight - separatorSize - font height) // 2 + font ascent.
+rowFontAscent := (rowHeight - separatorSize - font height) // 2 + font ascent.
-self columnsDo:[:aCol|aCol textInsetChanged:x].
 self changed:#columnsLayout.
 ^ preferredExtent
 !
 preferredExtentChanged
+"called if the preffered extent changed
+"
 |y x|
 y := viewOrigin y.
 x := viewOrigin x.
 self originChanged:(x negated  @ y negated).
 ]
 !
 recomputeHeightOfContents
+"recompute height of contents( scrolling )
+"
 preferredExtent notNil ifTrue:[
 preferredExtent y:(rowHeight * self size)
 ] ifFalse:[
 self preferredExtent
 ].
 ! !
 !DSVColumnView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.48 1998-08-08 11:49:06 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.49 1998-08-23 13:14:03 ca Exp $'
 ! !

changeset 1087	8e97cbfebe12
parent 1067	c66188014600
child 1089	931865a72ba7