<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body>
I think we wanted to avoid instVar shadowing ... Maybe use "anOwner"?
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Squeak-dev <squeak-dev-bounces@lists.squeakfoundation.org> on behalf of commits@source.squeak.org <commits@source.squeak.org><br>
<b>Sent:</b> Thursday, June 16, 2022 6:46:23 PM<br>
<b>To:</b> squeak-dev@lists.squeakfoundation.org <squeak-dev@lists.squeakfoundation.org><br>
<b>Subject:</b> [squeak-dev] The Inbox: Morphic-ct.2010.mcz</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">A new version of Morphic was added to project The Inbox:<br>
<a href="http://source.squeak.org/inbox/Morphic-ct.2010.mcz">http://source.squeak.org/inbox/Morphic-ct.2010.mcz</a><br>
<br>
==================== Summary ====================<br>
<br>
Name: Morphic-ct.2010<br>
Author: ct<br>
Time: 16 June 2022, 6:46:17.941852 pm<br>
UUID: 7427f838-4f8f-7b49-99f5-d08cd9eeac53<br>
Ancestors: Morphic-mt.2007<br>
<br>
Proposal to fix z-order of docking bar menus when etoys mode is activated.<br>
<br>
=============== Diff against Morphic-mt.2007 ===============<br>
<br>
Item was added:<br>
+ ----- Method: DockingBarMenuMorph>>popUpAdjacentTo:forHand:from: (in category 'as yet unclassified') -----<br>
+ popUpAdjacentTo: rightOrLeftPoint forHand: hand from: sourceItem<br>
+ <br>
+ | ownerInWorld world |<br>
+ super popUpAdjacentTo: rightOrLeftPoint forHand: hand from: sourceItem.<br>
+ <br>
+ "Docking bar and protruding menu should appear visually merged. Move the source item behind the receiver. If we did it the other way around, other navigators and docking bars in front of the sourceItem would cover the receiver. For the same reason,
we can't use a higher different morphic layer numbers for docking bar menus because this would hide them after all other navigators."<br>
+ world := owner world.<br>
+ ownerInWorld := sourceItem firstOwnerSuchThat: [:owner | owner owner == world].<br>
+ world addMorph: ownerInWorld inFrontOf: self.!<br>
<br>
Item was changed:<br>
----- Method: DockingBarMorph>>add:icon:help:subMenu: (in category 'construction') -----<br>
add: wordingString icon: aForm help: helpString subMenu: aMenuMorph <br>
"Append the given submenu with the given label."<br>
| item |<br>
item := DockingBarItemMorph new.<br>
item contents: wordingString.<br>
item subMenu: aMenuMorph.<br>
item icon: aForm.<br>
helpString isNil<br>
ifFalse: [item setBalloonText: helpString].<br>
aMenuMorph ifNotNil: [<br>
+ "Docking bar and protruding menu should appear visually merged."<br>
+ aMenuMorph morphicLayerNumber: self morphicLayerNumber].<br>
- aMenuMorph morphicLayerNumber: self morphicLayerNumber + 1].<br>
self addMorphBack: item!<br>
<br>
Item was changed:<br>
----- Method: DockingBarMorph>>add:icon:selectedIcon:help:subMenu: (in category 'construction') -----<br>
add: wordingString icon: aForm selectedIcon: anotherForm help: helpString subMenu: aMenuMorph
<br>
"Append the given submenu with the given label."<br>
| item |<br>
item := DockingBarItemMorph new<br>
contents: wordingString;<br>
subMenu: aMenuMorph;<br>
icon: aForm;<br>
selectedIcon: anotherForm.<br>
helpString ifNotNil: [<br>
item setBalloonText: helpString ].<br>
aMenuMorph ifNotNil: [<br>
+ "Docking bar and protruding menu should appear visually merged."<br>
+ aMenuMorph morphicLayerNumber: self morphicLayerNumber].<br>
- aMenuMorph morphicLayerNumber: self morphicLayerNumber + 1 ].<br>
self addMorphBack: item!<br>
<br>
Item was changed:<br>
----- Method: DockingBarMorph>>addItem: (in category 'construction') -----<br>
addItem: aBlock<br>
| item |<br>
item := DockingBarItemMorph new.<br>
aBlock value: item.<br>
item subMenu ifNotNil: [:menu |<br>
"Docking bar and protruding menu should appear visually merged."<br>
+ menu morphicLayerNumber: self morphicLayerNumber].<br>
- menu morphicLayerNumber: self morphicLayerNumber + 1].<br>
self addMorphBack: item!<br>
<br>
Item was changed:<br>
----- Method: DockingBarMorph>>addUpdatingItem: (in category 'construction') -----<br>
addUpdatingItem: aBlock<br>
| item |<br>
item := DockingBarUpdatingItemMorph new.<br>
aBlock value: item.<br>
item subMenu ifNotNil: [:menu |<br>
"Docking bar and protruding menu should appear visually merged."<br>
+ menu morphicLayerNumber: self morphicLayerNumber].<br>
- menu morphicLayerNumber: self morphicLayerNumber + 1].<br>
self addMorphBack: item!<br>
<br>
<br>
</div>
</span></font></div>
</body>
</html>