It seems we were trying to fix the same issue at the same time :) I'll move my commit System-Richo.19 to EtoysTreated then.
Cheers Richo
On Sun, May 30, 2010 at 2:01 PM, commits@source.squeak.org wrote:
Karl Ramberg uploaded a new version of Morphic to project Etoys: http://source.squeak.org/etoys/Morphic-kfr.11.mcz
==================== Summary ====================
Name: Morphic-kfr.11 Author: kfr Time: 30 May 2010, 7:00:31 pm UUID: b65a1832-143c-c04c-93b8-546765744bb0 Ancestors: Morphic-kfr.10
Guard agaist "target" not understanding decimalPlacesForGetter:
=============== Diff against Morphic-kfr.10 ===============
Item was changed: ----- Method: UpdatingStringMorph>>readFromTarget (in category 'target access') ----- readFromTarget "Update my readout from my target"
| v ret places | (target isNil or: [getSelector isNil]) ifTrue: [^contents]. ret _ self checkTarget. ret ifFalse: [^ '0'].
((target isMorph) or:[target isPlayerLike]) ifTrue:[ places _ target decimalPlacesForGetter: getSelector.
(places ~= nil and: [ places ~= decimalPlaces ]) ifTrue: [ self
decimalPlaces: places ]].
(places ~= nil and: [ places ~= decimalPlaces ]) ifTrue: [ self
decimalPlaces: places ]. v := target perform: getSelector. "scriptPerformer" (v isKindOf: Text) ifTrue: [v := v asString]. ^self acceptValueFromTarget: v!
Item was removed:
- ----- Method: Morph>>overlapsShadowForm:bounds: (in category 'geometry')
- overlapsShadowForm: itsShadow bounds: itsBounds
"Answer true if itsShadow and my shadow overlap at all"
| andForm overlapExtent |
overlapExtent _ (itsBounds intersect: self fullBounds) extent.
overlapExtent > (0 @ 0)
ifFalse: [^ false].
andForm _ self shadowForm.
overlapExtent ~= self fullBounds extent
ifTrue: [andForm _ andForm
contentsOfArea: (0 @ 0
extent: overlapExtent)].
andForm _ andForm
copyBits: (self fullBounds translateBy:
itsShadow offset negated)
from: itsShadow
at: 0 @ 0
clippingBox: (0 @ 0 extent: overlapExtent)
rule: Form and
fillColor: nil.
^ andForm bits
anySatisfy: [:w | w ~= 0]!
etoys-dev mailing list etoys-dev@squeakland.org http://lists.squeakland.org/mailman/listinfo/etoys-dev
Ok, I can't move it. But I'll delete the method Utilities>>#decimalPlacesForGetter: :)
Richo
On Sun, May 30, 2010 at 2:03 PM, Ricardo Moran richi.moran@gmail.comwrote:
It seems we were trying to fix the same issue at the same time :) I'll move my commit System-Richo.19 to EtoysTreated then.
Cheers Richo
On Sun, May 30, 2010 at 2:01 PM, commits@source.squeak.org wrote:
Karl Ramberg uploaded a new version of Morphic to project Etoys: http://source.squeak.org/etoys/Morphic-kfr.11.mcz
==================== Summary ====================
Name: Morphic-kfr.11 Author: kfr Time: 30 May 2010, 7:00:31 pm UUID: b65a1832-143c-c04c-93b8-546765744bb0 Ancestors: Morphic-kfr.10
Guard agaist "target" not understanding decimalPlacesForGetter:
=============== Diff against Morphic-kfr.10 ===============
Item was changed: ----- Method: UpdatingStringMorph>>readFromTarget (in category 'target access') ----- readFromTarget "Update my readout from my target"
| v ret places | (target isNil or: [getSelector isNil]) ifTrue: [^contents]. ret _ self checkTarget. ret ifFalse: [^ '0'].
((target isMorph) or:[target isPlayerLike]) ifTrue:[ places _ target decimalPlacesForGetter: getSelector.
(places ~= nil and: [ places ~= decimalPlaces ]) ifTrue: [ self
decimalPlaces: places ]].
(places ~= nil and: [ places ~= decimalPlaces ]) ifTrue: [ self
decimalPlaces: places ]. v := target perform: getSelector. "scriptPerformer" (v isKindOf: Text) ifTrue: [v := v asString]. ^self acceptValueFromTarget: v!
Item was removed:
- ----- Method: Morph>>overlapsShadowForm:bounds: (in category 'geometry')
- overlapsShadowForm: itsShadow bounds: itsBounds
"Answer true if itsShadow and my shadow overlap at all"
| andForm overlapExtent |
overlapExtent _ (itsBounds intersect: self fullBounds) extent.
overlapExtent > (0 @ 0)
ifFalse: [^ false].
andForm _ self shadowForm.
overlapExtent ~= self fullBounds extent
ifTrue: [andForm _ andForm
contentsOfArea: (0 @ 0
extent: overlapExtent)].
andForm _ andForm
copyBits: (self fullBounds translateBy:
itsShadow offset negated)
from: itsShadow
at: 0 @ 0
clippingBox: (0 @ 0 extent: overlapExtent)
rule: Form and
fillColor: nil.
^ andForm bits
anySatisfy: [:w | w ~= 0]!
etoys-dev mailing list etoys-dev@squeakland.org http://lists.squeakland.org/mailman/listinfo/etoys-dev
etoys-dev@lists.squeakfoundation.org