The Trunk: Morphic-mt.1285.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Morphic-mt.1285.mcz

commits-2
Marcel Taeumel uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-mt.1285.mcz

==================== Summary ====================

Name: Morphic-mt.1285
Author: mt
Time: 16 August 2016, 4:01:00.668602 pm
UUID: 3ed59e01-fc7e-e64f-9d96-1d0011aee676
Ancestors: Morphic-mt.1284

Sorry for the MVC-hickup. Make pop-up menus in MVC pop-up at the right location again.

=============== Diff against Morphic-mt.1284 ===============

Item was changed:
  ----- Method: HandMorph>>becomeActiveDuring: (in category 'initialization') -----
  becomeActiveDuring: aBlock
  "Make the receiver the ActiveHand during the evaluation of aBlock."
 
  | priorHand |
  priorHand := ActiveHand.
  ActiveHand := self.
+ ^ aBlock ensure: [
+ "nil check to support project switching."
+ ActiveHand ifNotNil: [ActiveHand := priorHand]].!
- ^ aBlock ensure: [ActiveHand := priorHand].!

Item was changed:
  ----- Method: MorphicEvent>>becomeActiveDuring: (in category 'initialize') -----
  becomeActiveDuring: aBlock
  "Make the receiver the ActiveEvent during the evaluation of aBlock."
 
  | priorEvent |
  priorEvent := ActiveEvent.
  ActiveEvent := self.
+ ^ aBlock ensure: [
+ "nil check to support project switching."
+ ActiveEvent ifNotNil: [ActiveEvent := priorEvent]].!
- ^ aBlock ensure: [ActiveEvent := priorEvent].!

Item was changed:
  ----- Method: PasteUpMorph>>becomeActiveDuring: (in category 'initialization') -----
  becomeActiveDuring: aBlock
  "Make the receiver the ActiveWorld during the evaluation of aBlock."
 
  | priorWorld |
  priorWorld := ActiveWorld.
  ActiveWorld := self.
+ ^ aBlock ensure: [
+ "nil check to support project switching."
+ ActiveWorld ifNotNil: [ActiveWorld := priorWorld]].!
- ^ aBlock ensure: [ActiveWorld := priorWorld].!