--- a/ColorMenu.st Mon Aug 21 23:54:15 2000 +0200
+++ b/ColorMenu.st Tue Aug 22 00:45:39 2000 +0200
@@ -253,7 +253,7 @@
! !
-!ColorMenu methodsFor:'accessing - channels'!
+!ColorMenu methodsFor:'accessing-channels'!
model
"get my color channel"
@@ -280,7 +280,7 @@
! !
-!ColorMenu methodsFor:'accessing look'!
+!ColorMenu methodsFor:'accessing-look'!
showSeparatingLines
"no drawing of separating lines here"
@@ -651,5 +651,5 @@
!ColorMenu class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.23 2000-08-21 18:29:32 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.24 2000-08-21 22:43:08 cg Exp $'
! !
--- a/DSVColumnView.st Mon Aug 21 23:54:15 2000 +0200
+++ b/DSVColumnView.st Tue Aug 22 00:45:39 2000 +0200
@@ -363,7 +363,7 @@
^ rowFontAscent
! !
-!DSVColumnView methodsFor:'accessing actions'!
+!DSVColumnView methodsFor:'accessing-actions'!
action:aOneArgAction
"set the action block to be performed on select
@@ -411,7 +411,7 @@
! !
-!DSVColumnView methodsFor:'accessing behavior'!
+!DSVColumnView methodsFor:'accessing-behavior'!
beDependentOfRows
"make myself dependent of any row; in this case any change notification
@@ -508,7 +508,7 @@
! !
-!DSVColumnView methodsFor:'accessing colors'!
+!DSVColumnView methodsFor:'accessing-colors'!
backgroundColor
"get the background color of the rows
@@ -582,7 +582,7 @@
! !
-!DSVColumnView methodsFor:'accessing columns'!
+!DSVColumnView methodsFor:'accessing-columns'!
columnAt:anIndex
"returns the column at an index
@@ -643,7 +643,7 @@
! !
-!DSVColumnView methodsFor:'accessing interactors'!
+!DSVColumnView methodsFor:'accessing-interactors'!
checkToggleActiveImage
^ checkToggleActiveImage
@@ -701,7 +701,7 @@
^ rowSelectorForm
! !
-!DSVColumnView methodsFor:'accessing mvc'!
+!DSVColumnView methodsFor:'accessing-mvc'!
columnAdaptor
"return the value of the instance variable 'columnAdaptor' (automatically generated)"
@@ -809,7 +809,7 @@
! !
-!DSVColumnView methodsFor:'accessing rows'!
+!DSVColumnView methodsFor:'accessing-rows'!
at:aRowNr
"return the row at an index, aRowNr
@@ -951,7 +951,7 @@
! !
-!DSVColumnView methodsFor:'accessing visibility'!
+!DSVColumnView methodsFor:'accessing-visibility'!
font:aFont
"set the font for all shown rows.
@@ -3411,5 +3411,5 @@
!DSVColumnView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.110 2000-08-17 09:40:45 tm Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.111 2000-08-21 22:43:12 cg Exp $'
! !
--- a/DataSetColumn.st Mon Aug 21 23:54:15 2000 +0200
+++ b/DataSetColumn.st Tue Aug 22 00:45:39 2000 +0200
@@ -13,6 +13,8 @@
+"{ Package: 'stx:libwidg2' }"
+
Object subclass:#DataSetColumn
instanceVariableNames:'columnNumber dataSet width description buttonExtent shownValue
rendererType backgroundColor rowSeparatorSelector
@@ -172,7 +174,7 @@
^ rendererType
! !
-!DataSetColumn methodsFor:'accessing colors'!
+!DataSetColumn methodsFor:'accessing-colors'!
backgroundColor
"returns the background color or nil
@@ -234,7 +236,7 @@
! !
-!DataSetColumn methodsFor:'accessing dimension'!
+!DataSetColumn methodsFor:'accessing-dimension'!
minWidth
"get the minimum width required by the column
@@ -1016,5 +1018,5 @@
!DataSetColumn class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/DataSetColumn.st,v 1.62 2000-02-25 13:20:01 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/DataSetColumn.st,v 1.63 2000-08-21 22:43:15 cg Exp $'
! !
--- a/DataSetLabel.st Mon Aug 21 23:54:15 2000 +0200
+++ b/DataSetLabel.st Tue Aug 22 00:45:39 2000 +0200
@@ -14,6 +14,8 @@
+"{ Package: 'stx:libwidg2' }"
+
Object subclass:#DataSetLabel
instanceVariableNames:'label selector argument adjust font fgColor bgColor
preferredHeight preferredWidth'
@@ -42,7 +44,7 @@
! !
-!DataSetLabel methodsFor:'accessing colors'!
+!DataSetLabel methodsFor:'accessing-colors'!
backgroundColor
"returns the background color or nil
@@ -59,7 +61,7 @@
! !
-!DataSetLabel methodsFor:'accessing dimensions'!
+!DataSetLabel methodsFor:'accessing-dimensions'!
preferredHeight
"returns my preferred height
@@ -291,5 +293,5 @@
!DataSetLabel class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/DataSetLabel.st,v 1.9 2000-02-18 14:32:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/DataSetLabel.st,v 1.10 2000-08-21 22:43:20 cg Exp $'
! !
--- a/EnterBoxWithList.st Mon Aug 21 23:54:15 2000 +0200
+++ b/EnterBoxWithList.st Tue Aug 22 00:45:39 2000 +0200
@@ -11,6 +11,8 @@
"
+"{ Package: 'stx:libwidg2' }"
+
EnterBox subclass:#EnterBoxWithList
instanceVariableNames:''
classVariableNames:''
@@ -55,7 +57,7 @@
! !
-!EnterBoxWithList methodsFor:'accessing - contents'!
+!EnterBoxWithList methodsFor:'accessing-contents'!
list:aList
enterField list:aList.
@@ -74,5 +76,5 @@
!EnterBoxWithList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/EnterBoxWithList.st,v 1.2 2000-02-18 14:33:04 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/EnterBoxWithList.st,v 1.3 2000-08-21 22:43:52 cg Exp $'
! !
--- a/FileSelectionItem.st Mon Aug 21 23:54:15 2000 +0200
+++ b/FileSelectionItem.st Tue Aug 22 00:45:39 2000 +0200
@@ -12,6 +12,8 @@
+"{ Package: 'stx:libwidg2' }"
+
TreeItem subclass:#FileSelectionItem
instanceVariableNames:'modificationTime matchAction isDirectory imageType showIndicator'
classVariableNames:''
@@ -226,7 +228,7 @@
"Modified: / 24.9.1998 / 16:02:53 / cg"
! !
-!FileSelectionItem methodsFor:'accessing hierarchy'!
+!FileSelectionItem methodsFor:'accessing-hierarchy'!
collapse
"check to release children
@@ -682,5 +684,5 @@
!FileSelectionItem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/FileSelectionItem.st,v 1.16 1999-03-19 21:23:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/FileSelectionItem.st,v 1.17 2000-08-21 22:43:56 cg Exp $'
! !
--- a/FileSelectionTree.st Mon Aug 21 23:54:15 2000 +0200
+++ b/FileSelectionTree.st Tue Aug 22 00:45:39 2000 +0200
@@ -12,6 +12,8 @@
+"{ Package: 'stx:libwidg2' }"
+
SelectionInTreeView subclass:#FileSelectionTree
instanceVariableNames:'triggerMonitorBlock monitoringDelayTime'
classVariableNames:''
@@ -442,7 +444,7 @@
^ nil
! !
-!FileSelectionTree methodsFor:'accessing monitoring'!
+!FileSelectionTree methodsFor:'accessing-monitoring'!
monitoring
"returns true if monitor process is running
@@ -741,5 +743,5 @@
!FileSelectionTree class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/FileSelectionTree.st,v 1.24 1999-05-18 19:11:46 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/FileSelectionTree.st,v 1.25 2000-08-21 22:43:59 cg Exp $'
! !
--- a/FontMenu.st Mon Aug 21 23:54:15 2000 +0200
+++ b/FontMenu.st Tue Aug 22 00:45:39 2000 +0200
@@ -296,7 +296,7 @@
^ false
! !
-!FontMenu methodsFor:'accessing channels'!
+!FontMenu methodsFor:'accessing-channels'!
model
"get my model
@@ -365,5 +365,5 @@
!FontMenu class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/FontMenu.st,v 1.9 2000-08-16 21:23:23 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/FontMenu.st,v 1.10 2000-08-21 22:44:03 cg Exp $'
! !
--- a/HierarchicalItem.st Mon Aug 21 23:54:15 2000 +0200
+++ b/HierarchicalItem.st Tue Aug 22 00:45:39 2000 +0200
@@ -105,7 +105,7 @@
! !
-!HierarchicalItem methodsFor:'accessing children'!
+!HierarchicalItem methodsFor:'accessing-children'!
at:anIndex
"returns the child under an index or nil
@@ -164,7 +164,7 @@
^ self at:(self children size)
! !
-!HierarchicalItem methodsFor:'accessing hierarchy'!
+!HierarchicalItem methodsFor:'accessing-hierarchy'!
collapse
"hide children
@@ -306,7 +306,7 @@
! !
-!HierarchicalItem methodsFor:'accessing mvc'!
+!HierarchicalItem methodsFor:'accessing-mvc'!
application
"returns the responsible application or nil
@@ -1510,5 +1510,5 @@
!HierarchicalItem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalItem.st,v 1.22 2000-08-15 05:38:25 ca Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalItem.st,v 1.23 2000-08-21 22:44:18 cg Exp $'
! !
--- a/HierarchicalList.st Mon Aug 21 23:54:15 2000 +0200
+++ b/HierarchicalList.st Tue Aug 22 00:45:39 2000 +0200
@@ -61,7 +61,7 @@
! !
-!HierarchicalList methodsFor:'accessing look'!
+!HierarchicalList methodsFor:'accessing-look'!
showRoot
"show or hide root item
@@ -85,7 +85,7 @@
! !
-!HierarchicalList methodsFor:'accessing monitoring task'!
+!HierarchicalList methodsFor:'accessing-monitoring task'!
monitoringTaskDelay
"get the delay time of the monitoring task measured in seconds
@@ -111,7 +111,7 @@
].
! !
-!HierarchicalList methodsFor:'accessing mvc'!
+!HierarchicalList methodsFor:'accessing-mvc'!
addDependent:anObject
"restart the monitoringTask if neccessary
@@ -162,7 +162,7 @@
! !
-!HierarchicalList methodsFor:'accessing root'!
+!HierarchicalList methodsFor:'accessing-root'!
root
"get the root item
@@ -334,5 +334,5 @@
!HierarchicalList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalList.st,v 1.8 2000-04-03 15:05:57 ca Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalList.st,v 1.9 2000-08-21 22:44:20 cg Exp $'
! !
--- a/HierarchicalListView.st Mon Aug 21 23:54:15 2000 +0200
+++ b/HierarchicalListView.st Tue Aug 22 00:45:39 2000 +0200
@@ -179,7 +179,7 @@
super list:aList
! !
-!HierarchicalListView methodsFor:'accessing colors'!
+!HierarchicalListView methodsFor:'accessing-colors'!
lineColor
"get the line color
@@ -206,7 +206,7 @@
! !
-!HierarchicalListView methodsFor:'accessing look'!
+!HierarchicalListView methodsFor:'accessing-look'!
alignTextRight
"align the text right
@@ -1027,5 +1027,5 @@
!HierarchicalListView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalListView.st,v 1.30 2000-07-29 16:07:43 ca Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalListView.st,v 1.31 2000-08-21 22:44:23 cg Exp $'
! !
--- a/ListModelView.st Mon Aug 21 23:54:15 2000 +0200
+++ b/ListModelView.st Tue Aug 22 00:45:39 2000 +0200
@@ -219,7 +219,7 @@
! !
-!ListModelView methodsFor:'accessing behavior'!
+!ListModelView methodsFor:'accessing-behavior'!
autoScroll
"returns true if auto scrolling is enabled
@@ -267,7 +267,7 @@
! !
-!ListModelView methodsFor:'accessing items'!
+!ListModelView methodsFor:'accessing-items'!
at:anIndex
"return the list element at an index
@@ -295,7 +295,7 @@
! !
-!ListModelView methodsFor:'accessing look'!
+!ListModelView methodsFor:'accessing-look'!
backgroundColor
"get the background color
@@ -364,7 +364,7 @@
! !
-!ListModelView methodsFor:'accessing mvc'!
+!ListModelView methodsFor:'accessing-mvc'!
listHolder
"returns the listHolder or nil
@@ -385,7 +385,7 @@
self list:(listHolder value).
! !
-!ListModelView methodsFor:'accessing views'!
+!ListModelView methodsFor:'accessing-views'!
destroyFrame:aFrame
"destroy a frame
@@ -1602,6 +1602,6 @@
!ListModelView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.44 2000-08-03 12:21:39 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.45 2000-08-21 22:44:36 cg Exp $'
! !
ListModelView initialize!
--- a/NoteBookView.st Mon Aug 21 23:54:15 2000 +0200
+++ b/NoteBookView.st Tue Aug 22 00:45:39 2000 +0200
@@ -365,7 +365,7 @@
! !
-!NoteBookView methodsFor:'accessing actions'!
+!NoteBookView methodsFor:'accessing-actions'!
accessTabMenuAction
"callback to retrieve the menu for a specific tab.
@@ -396,7 +396,7 @@
! !
-!NoteBookView methodsFor:'accessing behavior'!
+!NoteBookView methodsFor:'accessing-behavior'!
enabled
"returns true if tabs are enabled
@@ -443,7 +443,7 @@
selectConditionBlock := aOneArgBlock
! !
-!NoteBookView methodsFor:'accessing channels/holders'!
+!NoteBookView methodsFor:'accessing-channels/holders'!
canvasHolder
"get the model, which keeps the canvas, a kind of SimpleView
@@ -491,7 +491,7 @@
]
! !
-!NoteBookView methodsFor:'accessing dimension'!
+!NoteBookView methodsFor:'accessing-dimension'!
maxTabHeight
|e y|
@@ -542,7 +542,7 @@
^ numberOfLines * y + e
! !
-!NoteBookView methodsFor:'accessing look'!
+!NoteBookView methodsFor:'accessing-look'!
activeForegroundColor
"get the color to be used for drawing text
@@ -651,7 +651,7 @@
]
! !
-!NoteBookView methodsFor:'accessing style'!
+!NoteBookView methodsFor:'accessing-style'!
direction
"returns the direction of tabs as symbol. On default the value is
@@ -1805,7 +1805,7 @@
! !
-!NoteBookView::Tab methodsFor:'accessing dimensions'!
+!NoteBookView::Tab methodsFor:'accessing-dimensions'!
extent
"returns the extent of the label
@@ -1847,7 +1847,7 @@
! !
-!NoteBookView::Tab methodsFor:'accessing mvc'!
+!NoteBookView::Tab methodsFor:'accessing-mvc'!
addDependent:aGC
"make the noteBook be a dependent of the tab model
@@ -2197,5 +2197,5 @@
!NoteBookView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/NoteBookView.st,v 1.44 2000-08-10 17:28:08 ca Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/NoteBookView.st,v 1.45 2000-08-21 22:44:56 cg Exp $'
! !
--- a/SelectionInHierarchy.st Mon Aug 21 23:54:15 2000 +0200
+++ b/SelectionInHierarchy.st Tue Aug 22 00:45:39 2000 +0200
@@ -11,6 +11,8 @@
hereby transferred.
"
+"{ Package: 'stx:libwidg2' }"
+
Model subclass:#SelectionInHierarchy
instanceVariableNames:'root list selection'
classVariableNames:''
@@ -115,7 +117,7 @@
"Modified: 10.10.94 / 16:13:36 / W.Olberding"! !
-!SelectionInHierarchy methodsFor:'accessing sequencable'!
+!SelectionInHierarchy methodsFor:'accessing-sequencable'!
addChildAndSubChildren:aHierarchyNode below:existingHierarchyNode after:aChild
"Add a new HierarchyNode to the tree."
@@ -336,5 +338,5 @@
!SelectionInHierarchy class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInHierarchy.st,v 1.11 1999-02-11 17:45:41 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInHierarchy.st,v 1.12 2000-08-21 22:45:20 cg Exp $'
! !
--- a/SelectionInListModelView.st Mon Aug 21 23:54:15 2000 +0200
+++ b/SelectionInListModelView.st Tue Aug 22 00:45:39 2000 +0200
@@ -158,7 +158,7 @@
^ super list:aList
! !
-!SelectionInListModelView methodsFor:'accessing actions'!
+!SelectionInListModelView methodsFor:'accessing-actions'!
action
"get the action block to be performed on select
@@ -223,7 +223,7 @@
! !
-!SelectionInListModelView methodsFor:'accessing behavior'!
+!SelectionInListModelView methodsFor:'accessing-behavior'!
highlightMode
"get the mode how to draw a selected line:
@@ -1598,5 +1598,5 @@
!SelectionInListModelView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInListModelView.st,v 1.39 2000-06-28 08:45:45 tm Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInListModelView.st,v 1.40 2000-08-21 22:45:22 cg Exp $'
! !
--- a/SelectionInTree.st Mon Aug 21 23:54:15 2000 +0200
+++ b/SelectionInTree.st Tue Aug 22 00:45:39 2000 +0200
@@ -12,6 +12,8 @@
+"{ Package: 'stx:libwidg2' }"
+
Model subclass:#SelectionInTree
instanceVariableNames:'root list selection showRoot contentsAction labelAction
childrenAction iconAction indicatorList indicatorTask accessLock'
@@ -113,7 +115,7 @@
^ list
! !
-!SelectionInTree methodsFor:'accessing behavior'!
+!SelectionInTree methodsFor:'accessing-behavior'!
childrenAction
"get children action block
@@ -187,7 +189,7 @@
].
! !
-!SelectionInTree methodsFor:'accessing hierarchy'!
+!SelectionInTree methodsFor:'accessing-hierarchy'!
collapse:something
"collapse a node or collection of nodes
@@ -234,7 +236,7 @@
]
! !
-!SelectionInTree methodsFor:'accessing hierarchy new'!
+!SelectionInTree methodsFor:'accessing-hierarchy new'!
doCollapse:something
"collapse all children under an item or a sequence of items;
@@ -914,5 +916,5 @@
!SelectionInTree class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInTree.st,v 1.29 1999-09-22 09:35:19 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInTree.st,v 1.30 2000-08-21 22:45:27 cg Exp $'
! !
--- a/SubCanvas.st Mon Aug 21 23:54:15 2000 +0200
+++ b/SubCanvas.st Tue Aug 22 00:45:39 2000 +0200
@@ -11,6 +11,8 @@
"
+"{ Package: 'stx:libwidg2' }"
+
ScrollableView subclass:#SubCanvas
instanceVariableNames:'builder spec client clientHolder specHolder clientView
clientViewIsScrolled lateBuild'
@@ -149,7 +151,7 @@
"Created: / 10.3.1998 / 16:20:52 / stefan"
! !
-!SubCanvas methodsFor:'accessing channels'!
+!SubCanvas methodsFor:'accessing-channels'!
clientHolder
^ clientHolder
@@ -443,5 +445,5 @@
!SubCanvas class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/SubCanvas.st,v 1.25 2000-02-22 11:06:54 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/SubCanvas.st,v 1.26 2000-08-21 22:45:34 cg Exp $'
! !
--- a/TabWidget.st Mon Aug 21 23:54:15 2000 +0200
+++ b/TabWidget.st Tue Aug 22 00:45:39 2000 +0200
@@ -12,6 +12,8 @@
+"{ Package: 'stx:libwidg2' }"
+
Object subclass:#TabWidget
instanceVariableNames:'model tabView label disabledLabel printableLabel anchor extent
lineNr fgColor labelType'
@@ -20,14 +22,14 @@
category:'Views-Interactors'
!
-TabWidget subclass:#Window
+TabWidget subclass:#Mac
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
privateIn:TabWidget
!
-TabWidget subclass:#Mac
+TabWidget subclass:#Window
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
@@ -260,7 +262,7 @@
^ printableLabel
! !
-!TabWidget methodsFor:'accessing dimensions'!
+!TabWidget methodsFor:'accessing-dimensions'!
anchor
"returns the tab origin
@@ -559,6 +561,237 @@
! !
+!TabWidget::Mac class methodsFor:'accessing'!
+
+tabStyleOn:aView
+ |style|
+
+ style := super tabStyleOn:aView.
+ style at:#tabLevel put:2.
+ ^ style.
+! !
+
+!TabWidget::Mac class methodsFor:'calculate dimensions'!
+
+validateDimensions:aStyle
+ "validate dimensions for a style; could be redifined
+ "
+ |maxY maxX anchor lftIns|
+
+ maxY := aStyle at:#maxY.
+ maxX := (aStyle at:#maxX) - (aStyle at:#labelLeftInset).
+ anchor := aStyle at:#labelAnchor.
+ lftIns := maxY // 2.
+
+ anchor x:lftIns.
+
+ aStyle at:#maxX put:(maxX + lftIns + maxY).
+ aStyle at:#rightCovered put:(maxY // 2).
+! !
+
+!TabWidget::Mac methodsFor:'drawing'!
+
+redrawAtBottom:isSelected
+ "redraw tab at bottom of view
+ "
+ |origin corner level polygon x y x1 eX eY shadowColor lightColor|
+
+ isSelected ifFalse:[
+ lightColor := tabView styleAt:#lightColorUnselected.
+ shadowColor := tabView styleAt:#shadowColorUnselected.
+ tabView paint:(tabView styleAt:#unselectedColor).
+ ] ifTrue:[
+ lightColor := tabView styleAt:#lightColorSelected.
+ shadowColor := tabView styleAt:#shadowColorSelected.
+ tabView paint:(tabView styleAt:#selectedColor).
+ ].
+ polygon := Array new:5.
+ origin := self computeOrigin.
+ corner := self computeCorner.
+ level := tabView styleAt:#tabLevel.
+
+ x := origin x.
+ y := origin y.
+ eX := corner x.
+ eY := corner y.
+ x1 := eX - (tabView styleAt:#maxY).
+
+ polygon at:1 put:(Point x:x y:eY).
+ polygon at:2 put:(Point x:x y:y).
+ polygon at:3 put:(Point x:x1 y:y).
+ polygon at:4 put:(Point x:eX y:(y-extent y)).
+ polygon at:5 put:(Point x:eX y:eY).
+
+ tabView fillPolygon:polygon.
+ tabView paint:lightColor.
+
+ 1 to:level do:[:i|
+ "/ removed: cg
+"/ tabView displayLineFromX:x+1 y:y-i toX:x1+i y:y-i.
+ tabView displayLineFromX:x+i y:y-1 toX:x+i y:1.
+ ].
+ tabView paint:shadowColor.
+
+ "/ added: cg
+ 1 to:(level-2) do:[:i|
+ tabView displayLineFromX:x+1 y:y-i toX:x1+i y:y-i.
+ ].
+ tabView displayPolygon:polygon.
+
+ isSelected ifFalse:[
+ tabView displayLineFromX:x y:eY toX:eX y:eY.
+ ]
+
+ "Modified: / 21.5.1998 / 01:16:32 / cg"
+!
+
+redrawAtLeft:isSelected
+ "redraw tab at left of view
+ "
+ |origin corner polygon level x y y1 eX eY shadowColor lightColor|
+
+ isSelected ifFalse:[
+ lightColor := tabView styleAt:#lightColorUnselected.
+ shadowColor := tabView styleAt:#shadowColorUnselected.
+ tabView paint:(tabView styleAt:#unselectedColor).
+ ] ifTrue:[
+ lightColor := tabView styleAt:#lightColorSelected.
+ shadowColor := tabView styleAt:#shadowColorSelected.
+ tabView paint:(tabView styleAt:#selectedColor).
+ ].
+ polygon := Array new:5.
+ origin := self computeOrigin.
+ corner := self computeCorner.
+ level := tabView styleAt:#tabLevel.
+
+ x := origin x.
+ y := origin y.
+ eX := corner x.
+ eY := corner y.
+ y1 := eY - (tabView styleAt:#maxY).
+
+ polygon at:1 put:(Point x:eX y:y).
+ polygon at:2 put:(Point x:x y:y).
+ polygon at:3 put:(Point x:x y:y1).
+ polygon at:4 put:(Point x:(x+extent x) y:eY).
+ polygon at:5 put:(Point x:eX y:eY).
+
+ tabView fillPolygon:polygon.
+ tabView paint:lightColor.
+
+ 1 to:level do:[:i|
+ tabView displayLineFromX:eX y:y+i toX:x+2 y:y+i.
+ tabView displayLineFromX:x+i y:y+1 toX:x+i y:y1+i.
+ ].
+ tabView paint:shadowColor.
+ tabView displayPolygon:polygon.
+
+ isSelected ifFalse:[
+ tabView displayLineFromX:eX-1 y:y toX:eX-1 y:eY.
+ ]
+!
+
+redrawAtRight:isSelected
+ "redraw tab at right of view
+ "
+ |origin corner level polygon x y y1 eY shadowColor lightColor|
+
+ isSelected ifFalse:[
+ lightColor := tabView styleAt:#lightColorUnselected.
+ shadowColor := tabView styleAt:#shadowColorUnselected.
+ tabView paint:(tabView styleAt:#unselectedColor).
+ ] ifTrue:[
+ lightColor := tabView styleAt:#lightColorSelected.
+ shadowColor := tabView styleAt:#shadowColorSelected.
+ tabView paint:(tabView styleAt:#selectedColor).
+ ].
+ polygon := Array new:5.
+ origin := self computeOrigin.
+ corner := self computeCorner.
+ level := tabView styleAt:#tabLevel.
+
+ x := origin x.
+ y := origin y.
+ eY := corner y.
+ y1 := eY - (tabView styleAt:#maxY).
+
+ polygon at:1 put:(Point x:0 y:y).
+ polygon at:2 put:(Point x:x y:y).
+ polygon at:3 put:(Point x:x y:y1).
+ polygon at:4 put:(Point x:(x-extent x) y:eY).
+ polygon at:5 put:(Point x:0 y:eY).
+
+ tabView fillPolygon:polygon.
+ tabView paint:lightColor.
+
+ 1 to:level do:[:i|
+ tabView displayLineFromX:0 y:y+i toX:x-1 y:y+i.
+ "/ removed: cg
+"/ tabView displayLineFromX:x-i y:y+1 toX:x-i y:y1+i.
+ ].
+ tabView paint:shadowColor.
+ tabView displayPolygon:polygon.
+
+ "/ added: cg
+ 1 to:level-2 do:[:i|
+ tabView displayLineFromX:x-i y:y+1 toX:x-i y:y1+i.
+ ].
+
+ isSelected ifFalse:[
+ tabView displayLineFromX:0 y:y toX:0 y:eY.
+ ]
+
+ "Modified: / 21.5.1998 / 01:16:24 / cg"
+!
+
+redrawAtTop:isSelected
+ "redraw tab at top of view
+ "
+ |origin corner level polygon x y x1 eX eY shadowColor lightColor|
+
+ isSelected ifFalse:[
+ lightColor := tabView styleAt:#lightColorUnselected.
+ shadowColor := tabView styleAt:#shadowColorUnselected.
+ tabView paint:(tabView styleAt:#unselectedColor).
+ ] ifTrue:[
+ lightColor := tabView styleAt:#lightColorSelected.
+ shadowColor := tabView styleAt:#shadowColorSelected.
+ tabView paint:(tabView styleAt:#selectedColor).
+ ].
+ polygon := Array new:5.
+ origin := self computeOrigin.
+ corner := self computeCorner.
+ level := tabView styleAt:#tabLevel.
+
+ x := origin x.
+ y := origin y.
+ eX := corner x - 1.
+ eY := corner y.
+ x1 := eX - (tabView styleAt:#maxY).
+
+ polygon at:1 put:(Point x:x y:eY).
+ polygon at:2 put:(Point x:x y:y).
+ polygon at:3 put:(Point x:x1 y:y).
+ polygon at:4 put:(Point x:eX y:(y+extent y)).
+ polygon at:5 put:(Point x:eX y:eY).
+
+ tabView fillPolygon:polygon.
+ tabView paint:lightColor.
+
+ 1 to:level do:[:i|
+ tabView displayLineFromX:x+i y:eY toX:x+i y:y+1.
+ tabView displayLineFromX:x+1 y:y+i toX:x1+i y:y+i.
+ ].
+ tabView paint:shadowColor.
+ tabView displayPolygon:polygon.
+
+ isSelected ifFalse:[
+ tabView displayLineFromX:x y:eY-1 toX:eX y:eY-1.
+ ]
+
+
+! !
+
!TabWidget::Window class methodsFor:'accessing'!
tabStyleOn:aView
@@ -850,239 +1083,8 @@
].
! !
-!TabWidget::Mac class methodsFor:'accessing'!
-
-tabStyleOn:aView
- |style|
-
- style := super tabStyleOn:aView.
- style at:#tabLevel put:2.
- ^ style.
-! !
-
-!TabWidget::Mac class methodsFor:'calculate dimensions'!
-
-validateDimensions:aStyle
- "validate dimensions for a style; could be redifined
- "
- |maxY maxX anchor lftIns|
-
- maxY := aStyle at:#maxY.
- maxX := (aStyle at:#maxX) - (aStyle at:#labelLeftInset).
- anchor := aStyle at:#labelAnchor.
- lftIns := maxY // 2.
-
- anchor x:lftIns.
-
- aStyle at:#maxX put:(maxX + lftIns + maxY).
- aStyle at:#rightCovered put:(maxY // 2).
-! !
-
-!TabWidget::Mac methodsFor:'drawing'!
-
-redrawAtBottom:isSelected
- "redraw tab at bottom of view
- "
- |origin corner level polygon x y x1 eX eY shadowColor lightColor|
-
- isSelected ifFalse:[
- lightColor := tabView styleAt:#lightColorUnselected.
- shadowColor := tabView styleAt:#shadowColorUnselected.
- tabView paint:(tabView styleAt:#unselectedColor).
- ] ifTrue:[
- lightColor := tabView styleAt:#lightColorSelected.
- shadowColor := tabView styleAt:#shadowColorSelected.
- tabView paint:(tabView styleAt:#selectedColor).
- ].
- polygon := Array new:5.
- origin := self computeOrigin.
- corner := self computeCorner.
- level := tabView styleAt:#tabLevel.
-
- x := origin x.
- y := origin y.
- eX := corner x.
- eY := corner y.
- x1 := eX - (tabView styleAt:#maxY).
-
- polygon at:1 put:(Point x:x y:eY).
- polygon at:2 put:(Point x:x y:y).
- polygon at:3 put:(Point x:x1 y:y).
- polygon at:4 put:(Point x:eX y:(y-extent y)).
- polygon at:5 put:(Point x:eX y:eY).
-
- tabView fillPolygon:polygon.
- tabView paint:lightColor.
-
- 1 to:level do:[:i|
- "/ removed: cg
-"/ tabView displayLineFromX:x+1 y:y-i toX:x1+i y:y-i.
- tabView displayLineFromX:x+i y:y-1 toX:x+i y:1.
- ].
- tabView paint:shadowColor.
-
- "/ added: cg
- 1 to:(level-2) do:[:i|
- tabView displayLineFromX:x+1 y:y-i toX:x1+i y:y-i.
- ].
- tabView displayPolygon:polygon.
-
- isSelected ifFalse:[
- tabView displayLineFromX:x y:eY toX:eX y:eY.
- ]
-
- "Modified: / 21.5.1998 / 01:16:32 / cg"
-!
-
-redrawAtLeft:isSelected
- "redraw tab at left of view
- "
- |origin corner polygon level x y y1 eX eY shadowColor lightColor|
-
- isSelected ifFalse:[
- lightColor := tabView styleAt:#lightColorUnselected.
- shadowColor := tabView styleAt:#shadowColorUnselected.
- tabView paint:(tabView styleAt:#unselectedColor).
- ] ifTrue:[
- lightColor := tabView styleAt:#lightColorSelected.
- shadowColor := tabView styleAt:#shadowColorSelected.
- tabView paint:(tabView styleAt:#selectedColor).
- ].
- polygon := Array new:5.
- origin := self computeOrigin.
- corner := self computeCorner.
- level := tabView styleAt:#tabLevel.
-
- x := origin x.
- y := origin y.
- eX := corner x.
- eY := corner y.
- y1 := eY - (tabView styleAt:#maxY).
-
- polygon at:1 put:(Point x:eX y:y).
- polygon at:2 put:(Point x:x y:y).
- polygon at:3 put:(Point x:x y:y1).
- polygon at:4 put:(Point x:(x+extent x) y:eY).
- polygon at:5 put:(Point x:eX y:eY).
-
- tabView fillPolygon:polygon.
- tabView paint:lightColor.
-
- 1 to:level do:[:i|
- tabView displayLineFromX:eX y:y+i toX:x+2 y:y+i.
- tabView displayLineFromX:x+i y:y+1 toX:x+i y:y1+i.
- ].
- tabView paint:shadowColor.
- tabView displayPolygon:polygon.
-
- isSelected ifFalse:[
- tabView displayLineFromX:eX-1 y:y toX:eX-1 y:eY.
- ]
-!
-
-redrawAtRight:isSelected
- "redraw tab at right of view
- "
- |origin corner level polygon x y y1 eY shadowColor lightColor|
-
- isSelected ifFalse:[
- lightColor := tabView styleAt:#lightColorUnselected.
- shadowColor := tabView styleAt:#shadowColorUnselected.
- tabView paint:(tabView styleAt:#unselectedColor).
- ] ifTrue:[
- lightColor := tabView styleAt:#lightColorSelected.
- shadowColor := tabView styleAt:#shadowColorSelected.
- tabView paint:(tabView styleAt:#selectedColor).
- ].
- polygon := Array new:5.
- origin := self computeOrigin.
- corner := self computeCorner.
- level := tabView styleAt:#tabLevel.
-
- x := origin x.
- y := origin y.
- eY := corner y.
- y1 := eY - (tabView styleAt:#maxY).
-
- polygon at:1 put:(Point x:0 y:y).
- polygon at:2 put:(Point x:x y:y).
- polygon at:3 put:(Point x:x y:y1).
- polygon at:4 put:(Point x:(x-extent x) y:eY).
- polygon at:5 put:(Point x:0 y:eY).
-
- tabView fillPolygon:polygon.
- tabView paint:lightColor.
-
- 1 to:level do:[:i|
- tabView displayLineFromX:0 y:y+i toX:x-1 y:y+i.
- "/ removed: cg
-"/ tabView displayLineFromX:x-i y:y+1 toX:x-i y:y1+i.
- ].
- tabView paint:shadowColor.
- tabView displayPolygon:polygon.
-
- "/ added: cg
- 1 to:level-2 do:[:i|
- tabView displayLineFromX:x-i y:y+1 toX:x-i y:y1+i.
- ].
-
- isSelected ifFalse:[
- tabView displayLineFromX:0 y:y toX:0 y:eY.
- ]
-
- "Modified: / 21.5.1998 / 01:16:24 / cg"
-!
-
-redrawAtTop:isSelected
- "redraw tab at top of view
- "
- |origin corner level polygon x y x1 eX eY shadowColor lightColor|
-
- isSelected ifFalse:[
- lightColor := tabView styleAt:#lightColorUnselected.
- shadowColor := tabView styleAt:#shadowColorUnselected.
- tabView paint:(tabView styleAt:#unselectedColor).
- ] ifTrue:[
- lightColor := tabView styleAt:#lightColorSelected.
- shadowColor := tabView styleAt:#shadowColorSelected.
- tabView paint:(tabView styleAt:#selectedColor).
- ].
- polygon := Array new:5.
- origin := self computeOrigin.
- corner := self computeCorner.
- level := tabView styleAt:#tabLevel.
-
- x := origin x.
- y := origin y.
- eX := corner x - 1.
- eY := corner y.
- x1 := eX - (tabView styleAt:#maxY).
-
- polygon at:1 put:(Point x:x y:eY).
- polygon at:2 put:(Point x:x y:y).
- polygon at:3 put:(Point x:x1 y:y).
- polygon at:4 put:(Point x:eX y:(y+extent y)).
- polygon at:5 put:(Point x:eX y:eY).
-
- tabView fillPolygon:polygon.
- tabView paint:lightColor.
-
- 1 to:level do:[:i|
- tabView displayLineFromX:x+i y:eY toX:x+i y:y+1.
- tabView displayLineFromX:x+1 y:y+i toX:x1+i y:y+i.
- ].
- tabView paint:shadowColor.
- tabView displayPolygon:polygon.
-
- isSelected ifFalse:[
- tabView displayLineFromX:x y:eY-1 toX:eX y:eY-1.
- ]
-
-
-! !
-
!TabWidget class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/TabWidget.st,v 1.21 1999-08-18 14:33:04 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/TabWidget.st,v 1.22 2000-08-21 22:45:36 cg Exp $'
! !
--- a/TreeItem.st Mon Aug 21 23:54:15 2000 +0200
+++ b/TreeItem.st Tue Aug 22 00:45:39 2000 +0200
@@ -13,6 +13,8 @@
+"{ Package: 'stx:libwidg2' }"
+
Object subclass:#TreeItem
instanceVariableNames:'name tree parent children contents hide readChildren'
classVariableNames:'UnknownContents'
@@ -264,7 +266,7 @@
self contents:something
! !
-!TreeItem methodsFor:'accessing children'!
+!TreeItem methodsFor:'accessing-children'!
basicLastChild
"returns the last child without checking for valid sequence
@@ -321,7 +323,7 @@
readChildren:= aBoolean
! !
-!TreeItem methodsFor:'accessing dimensions'!
+!TreeItem methodsFor:'accessing-dimensions'!
childrenWidthOn:aDevice
"returns the maximum name length of my children
@@ -338,7 +340,7 @@
^ max
! !
-!TreeItem methodsFor:'accessing hierarchy'!
+!TreeItem methodsFor:'accessing-hierarchy'!
collapse
"hide all my children
@@ -372,7 +374,7 @@
]
! !
-!TreeItem methodsFor:'accessing model'!
+!TreeItem methodsFor:'accessing-model'!
model
"get my model (an instance of selection in tree) or nil
@@ -1032,6 +1034,6 @@
!TreeItem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/TreeItem.st,v 1.35 1999-09-22 09:35:07 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/TreeItem.st,v 1.36 2000-08-21 22:45:39 cg Exp $'
! !
TreeItem initialize!