[squeak-dev] The Trunk: MorphicExtras-cmm.101.mcz
commits at source.squeak.org
commits at source.squeak.org
Tue Jun 21 20:37:48 UTC 2011
Chris Muller uploaded a new version of MorphicExtras to project The Trunk:
http://source.squeak.org/trunk/MorphicExtras-cmm.101.mcz
==================== Summary ====================
Name: MorphicExtras-cmm.101
Author: cmm
Time: 21 June 2011, 3:37:20.304 pm
UUID: f85435f1-3081-4a2f-9e30-ea887221b543
Ancestors: MorphicExtras-ul.100, MorphicExtras-HenrikSperreJohansen.100
Merged MorphicExtras-HenrikSperreJohansen.100.
=============== Diff against MorphicExtras-ul.100 ===============
Item was changed:
----- Method: TrashCanMorph class>>moveToTrash: (in category 'miscellaneous') -----
moveToTrash: aMorph
+ SoundService soundEnabled ifTrue:
- Preferences soundsEnabled ifTrue:
[Preferences preserveTrash
ifFalse:
[self playSoundNamed: 'scratch']
ifTrue:
[self playDeleteSound]].
aMorph delete.
aMorph == Utilities scrapsBook ifFalse:
[Utilities addToTrash: aMorph]!
Item was changed:
----- Method: TrashCanMorph>>acceptDroppingMorph:event: (in category 'layout') -----
acceptDroppingMorph: aMorph event: evt
+ SoundService soundEnabled
- Preferences soundsEnabled
ifTrue: [Preferences preserveTrash
ifTrue: [self class playDeleteSound]
ifFalse: [self playSoundNamed: 'scratch']].
evt hand visible: true.
self state: #off.
aMorph delete.
aMorph == Utilities scrapsBook
ifFalse: [Utilities addToTrash: aMorph removeHalo]!
Item was changed:
----- Method: TrashCanMorph>>mouseEnter: (in category 'event handling') -----
mouseEnter: event
"Present feedback for potential deletion."
| hand firstSub |
hand := event hand.
((hand submorphCount > 0
and: [(firstSub := hand submorphs first) ~~ self])
and: [self wantsDroppedMorph: firstSub event: event])
+ ifTrue: [SoundService soundEnabled
- ifTrue: [Preferences soundsEnabled
ifTrue: [self class playMouseEnterSound].
"hand visible: false." "This leads to confusion. Let morph and hand appear til dropped."
"self world abandonAllHalos."
"hand halo: nil."
self state: #pressed]
ifFalse: [self showStampIn: hand]!
Item was changed:
----- Method: TrashCanMorph>>mouseLeave: (in category 'event handling') -----
mouseLeave: event
"Present feedback for aborted deletion."
| hand |
hand := event hand.
((hand submorphCount > 0) and:
[hand submorphs first ~~ self])
ifTrue:
+ [SoundService soundEnabled ifTrue: [self class playMouseLeaveSound].
- [Preferences soundsEnabled ifTrue: [self class playMouseLeaveSound].
hand visible: true.
self state: #off]
ifFalse:
[self stopShowingStampIn: hand].
!
More information about the Squeak-dev
mailing list
|