--- a/DSVColumnView.st Wed Apr 23 16:53:26 2003 +0200
+++ b/DSVColumnView.st Fri Apr 25 02:09:43 2003 +0200
@@ -2408,21 +2408,29 @@
!DSVColumnView methodsFor:'gc operations'!
-imageOnDevice:anImage
+imageOnMyDevice: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 onDevice:device.
- ].
- image isImage ifTrue:[
- image := image clearMaskedPixels
- ]
+ |deviceImage|
+
+ anImage isNil ifTrue:[^ anImage].
+
+ deviceImage := anImage onDevice:device.
+ deviceImage isImage ifTrue:[
+ deviceImage clearMaskedPixels.
].
- ^ image
-
+ ^ deviceImage
+"/ |image|
+"/
+"/ (image := anImage) notNil ifTrue:[
+"/ image device ~~ device ifTrue:[
+"/ image := image copy onDevice:device.
+"/ ].
+"/ image isImage ifTrue:[
+"/ image := image clearMaskedPixels
+"/ ]
+"/ ].
+"/ ^ image
!
registerImage:anImage key:aKey
@@ -2433,7 +2441,7 @@
(img := registererImages at:aKey ifAbsent:nil) notNil ifTrue:[
^ img
].
- img := self imageOnDevice:anImage.
+ img := self imageOnMyDevice:anImage.
registererImages at:aKey put:img.
^ img
!
@@ -2472,11 +2480,11 @@
buttonHalfLightColor notNil ifTrue:[
buttonHalfLightColor := buttonHalfLightColor onDevice:device
].
- rowSelectorForm := self imageOnDevice:rowSelectorForm.
- checkToggleActiveImage := self imageOnDevice:checkToggleActiveImage.
- checkTogglePassiveImage := self imageOnDevice:checkTogglePassiveImage.
- comboButtonForm := self imageOnDevice:comboButtonForm.
- checkToggleForm := self imageOnDevice:checkToggleForm.
+ rowSelectorForm := self imageOnMyDevice:rowSelectorForm.
+ checkToggleActiveImage := self imageOnMyDevice:checkToggleActiveImage.
+ checkTogglePassiveImage := self imageOnMyDevice:checkTogglePassiveImage.
+ comboButtonForm := self imageOnMyDevice:comboButtonForm.
+ checkToggleForm := self imageOnMyDevice:checkToggleForm.
!
initStyle
@@ -3861,5 +3869,5 @@
!DSVColumnView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.166 2003-04-23 14:53:26 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.167 2003-04-25 00:08:48 cg Exp $'
! !
--- a/HierarchicalListView.st Wed Apr 23 16:53:26 2003 +0200
+++ b/HierarchicalListView.st Fri Apr 25 02:09:43 2003 +0200
@@ -470,7 +470,7 @@
icon isNil ifTrue:[^ nil].
realized ifTrue:[
- icon := self imageOnDevice:icon
+ icon := self imageOnMyDevice:icon
].
icons at:aKey put:icon.
^ icon
@@ -486,13 +486,12 @@
].
aDictionary keysAndValuesDo:[:aKey :anImage|
- (image := self imageOnDevice:anImage) notNil ifTrue:[
+ (image := self imageOnMyDevice:anImage) notNil ifTrue:[
icons at:aKey put:image
] ifFalse:[
icons removeKey:aKey ifAbsent:nil
]
]
-
!
showIndicators
@@ -1231,15 +1230,15 @@
super fetchResources.
lineColor := lineColor onDevice:device.
- openIndicator := self imageOnDevice:openIndicator.
- closeIndicator := self imageOnDevice:closeIndicator.
+ openIndicator := self imageOnMyDevice:openIndicator.
+ closeIndicator := self imageOnMyDevice:closeIndicator.
defaultWidth := imageWidth.
icons keysAndValuesDo:[:aKey :anImage|
anImage isNil ifTrue:[
('HierachicalListView [warning]: missing image: ' , aKey) errorPrintCR.
] ifFalse:[
- image := self imageOnDevice:anImage.
+ image := self imageOnMyDevice:anImage.
icons at:aKey put:image.
imageWidth := image width max:imageWidth.
]
@@ -1307,7 +1306,7 @@
iconOrKey device == device ifTrue:[
^ iconOrKey
].
- ^ icons at:iconOrKey ifAbsentPut:[ self imageOnDevice:iconOrKey ].
+ ^ icons at:iconOrKey ifAbsentPut:[ self imageOnMyDevice:iconOrKey ].
].
image := icons at:iconOrKey ifAbsent:nil.
@@ -1320,13 +1319,13 @@
].
anItem hasChildren ifFalse:[
- ^ icons at:#empty ifAbsentPut:[ self imageOnDevice:(self class emptyIcon) ]
+ ^ icons at:#empty ifAbsentPut:[ self imageOnMyDevice:(self class emptyIcon) ]
].
anItem isExpanded ifTrue:[
- ^ icons at:#expanded ifAbsentPut:[ self imageOnDevice:(self class expandedIcon) ].
+ ^ icons at:#expanded ifAbsentPut:[ self imageOnMyDevice:(self class expandedIcon) ].
].
- ^ icons at:#collapsed ifAbsentPut:[ self imageOnDevice:(self class collapsedIcon) ].
+ ^ icons at:#collapsed ifAbsentPut:[ self imageOnMyDevice:(self class collapsedIcon) ].
!
lineHeightFor:anItem
@@ -1585,5 +1584,5 @@
!HierarchicalListView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalListView.st,v 1.80 2002-12-23 08:14:58 ca Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalListView.st,v 1.81 2003-04-25 00:09:43 cg Exp $'
! !
--- a/ListModelView.st Wed Apr 23 16:53:26 2003 +0200
+++ b/ListModelView.st Fri Apr 25 02:09:43 2003 +0200
@@ -888,20 +888,29 @@
^ aColor notNil ifTrue:[aColor onDevice:device] ifFalse:[nil]
!
-imageOnDevice:anImage
+imageOnMyDevice:anImage
"associate image to device and clear pixel mask
returns the new image.
"
- |image|
+ |deviceImage|
+
+ anImage isNil ifTrue:[^ anImage].
- (image := anImage) notNil ifTrue:[
- image device ~~ device ifTrue:[
- image := image copy.
- ].
- image := image onDevice:device.
- image := image clearMaskedPixels.
+ deviceImage := anImage onDevice:device.
+ deviceImage isImage ifTrue:[
+ deviceImage clearMaskedPixels.
].
- ^ image
+ ^ deviceImage
+"/ |image|
+"/
+"/ (image := anImage) notNil ifTrue:[
+"/ image device ~~ device ifTrue:[
+"/ image := image copy.
+"/ ].
+"/ image := image onDevice:device.
+"/ image := image clearMaskedPixels.
+"/ ].
+"/ ^ image
! !
!ListModelView methodsFor:'focus handling'!
@@ -1643,7 +1652,7 @@
!ListModelView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.76 2003-04-15 11:57:02 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.77 2003-04-25 00:08:57 cg Exp $'
! !
ListModelView initialize!
--- a/MenuPanel.st Wed Apr 23 16:53:26 2003 +0200
+++ b/MenuPanel.st Fri Apr 25 02:09:43 2003 +0200
@@ -3522,7 +3522,7 @@
!MenuPanel methodsFor:'image registration'!
-imageOnDevice:anImage
+imageOnMyDevice:anImage
"returns image registered on device
"
^ self class image:anImage onDevice:device
@@ -6543,16 +6543,16 @@
^ self
].
displayLabel isImageOrForm ifTrue:[
- displayLabel := menuPanel imageOnDevice:displayLabel.
+ displayLabel := menuPanel imageOnMyDevice:displayLabel.
^ self.
].
(displayLabel isKindOf:LabelAndIcon) ifTrue:[
(icon := displayLabel image) notNil ifTrue:[
- displayLabel image:(menuPanel imageOnDevice:icon)
+ displayLabel image:(menuPanel imageOnMyDevice:icon)
].
(icon := displayLabel icon) notNil ifTrue:[
- displayLabel icon:(menuPanel imageOnDevice:icon)
+ displayLabel icon:(menuPanel imageOnMyDevice:icon)
].
^ self
].
@@ -6562,14 +6562,14 @@
displayLabel keysAndValuesDo:[:i :el|
(el notNil and:[el isString not]) ifTrue:[
el isImageOrForm ifTrue:[
- displayLabel at:i put:(menuPanel imageOnDevice:el).
+ displayLabel at:i put:(menuPanel imageOnMyDevice:el).
] ifFalse:[
el class == LabelAndIcon ifTrue:[
(icon := el image) notNil ifTrue:[
- el image:(menuPanel imageOnDevice:icon)
+ el image:(menuPanel imageOnMyDevice:icon)
].
(icon := el icon) notNil ifTrue:[
- el icon:(menuPanel imageOnDevice:icon)
+ el icon:(menuPanel imageOnMyDevice:icon)
]
]
]
@@ -7372,7 +7372,7 @@
!MenuPanel class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.364 2003-04-22 09:43:24 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.365 2003-04-25 00:09:09 cg Exp $'
! !
MenuPanel initialize!
--- a/SelectionInTreeView.st Wed Apr 23 16:53:26 2003 +0200
+++ b/SelectionInTreeView.st Fri Apr 25 02:09:43 2003 +0200
@@ -451,21 +451,30 @@
"Created: 3.7.1997 / 12:34:34 / cg"
!
-imageOnDevice:anImage
+imageOnMyDevice:anImage
"associate image to device and clear pixel mask (in case of realized);
returns the new image.
"
- |img|
-
- img := anImage.
- img notNil ifTrue:[
- img device ~~ device ifTrue:[
- img := img copy.
- ].
- img := img onDevice:device.
- img := img clearMaskedPixels.
+ |deviceImage|
+
+ anImage isNil ifTrue:[^ anImage].
+
+ deviceImage := anImage onDevice:device.
+ deviceImage isImage ifTrue:[
+ deviceImage clearMaskedPixels.
].
- ^ img
+ ^ deviceImage
+"/ |img|
+"/
+"/ img := anImage.
+"/ img notNil ifTrue:[
+"/ img device ~~ device ifTrue:[
+"/ img := img copy.
+"/ ].
+"/ img := img onDevice:device.
+"/ img := img clearMaskedPixels.
+"/ ].
+"/ ^ img
"Modified: / 12.8.1998 / 12:46:38 / cg"
!
@@ -1507,7 +1516,7 @@
x := y := 0.
imageOpened isNil ifTrue:[
- imageOpened := self imageOnDevice:(self class imageOpened)
+ imageOpened := self imageOnMyDevice:(self class imageOpened)
].
imageOpened notNil ifTrue:[
x := x max:(imageOpened width).
@@ -1515,7 +1524,7 @@
].
imageClosed isNil ifTrue:[
- imageClosed := self imageOnDevice:(self class imageClosed)
+ imageClosed := self imageOnMyDevice:(self class imageClosed)
].
imageClosed notNil ifTrue:[
x := x max:(imageClosed width).
@@ -1523,7 +1532,7 @@
].
imageItem isNil ifTrue:[
- imageItem := self imageOnDevice:(self class imageItem)
+ imageItem := self imageOnMyDevice:(self class imageItem)
].
imageItem notNil ifTrue:[
x := x max:(imageItem width).
@@ -1533,7 +1542,7 @@
(keysAndIcons := self fetchDefaultImages) notNil ifTrue:[
keysAndIcons keysAndValuesDo:[:aKey :anIcon|
(anIcon isImage and:[aKey notNil]) ifTrue:[
- registeredImages at:aKey put:(self imageOnDevice:anIcon)
+ registeredImages at:aKey put:(self imageOnMyDevice:anIcon)
]
]
].
@@ -1623,14 +1632,14 @@
x := 0.
openIndicator isNil ifTrue:[
- openIndicator := self imageOnDevice:(self class openIndicator)
+ openIndicator := self imageOnMyDevice:(self class openIndicator)
].
openIndicator notNil ifTrue:[
x := openIndicator width
].
closeIndicator isNil ifTrue:[
- closeIndicator := self imageOnDevice:(self class closeIndicator)
+ closeIndicator := self imageOnMyDevice:(self class closeIndicator)
].
closeIndicator notNil ifTrue:[
x := x max:(closeIndicator width)
@@ -2093,7 +2102,7 @@
^ img
].
icon isImage ifTrue:[
- img := self imageOnDevice:icon.
+ img := self imageOnMyDevice:icon.
registeredImages at:icon put:img.
^ img
]
@@ -2107,7 +2116,6 @@
].
"/ folder
^ aNode hidden ifTrue:[imageClosed] ifFalse:[imageOpened]
-
!
indexOfNode:aNode
@@ -2469,5 +2477,5 @@
!SelectionInTreeView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInTreeView.st,v 1.100 2003-04-15 11:59:15 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInTreeView.st,v 1.101 2003-04-25 00:09:28 cg Exp $'
! !