<div dir="ltr">And I added a little padding around the menu title icon. <div><br></div><div>Karl</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Apr 26, 2015 at 7:54 AM, <span dir="ltr"><<a href="mailto:commits@source.squeak.org" target="_blank">commits@source.squeak.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Karl Ramberg uploaded a new version of Morphic to project The Trunk:<br>
<a href="http://source.squeak.org/trunk/Morphic-kfr.929.mcz" target="_blank">http://source.squeak.org/trunk/Morphic-kfr.929.mcz</a><br>
<br>
==================== Summary ====================<br>
<br>
Name: Morphic-kfr.929<br>
Author: kfr<br>
Time: 26 April 2015, 7:54:03.007 am<br>
UUID: 0835731c-0e6e-e640-99dd-fb130844d732<br>
Ancestors: Morphic-mt.928<br>
<br>
A few places still referenced Preferences menu colors. Fixed here<br>
<br>
=============== Diff against Morphic-mt.928 ===============<br>
<br>
Item was changed:<br>
----- Method: MenuMorph>>addStayUpIcons (in category 'construction') -----<br>
addStayUpIcons<br>
| title closeBox pinBox titleBarArea titleString |<br>
title := submorphs<br>
detect: [:ea | ea hasProperty: #titleString]<br>
ifNone: [self setProperty: #needsTitlebarWidgets toValue: true.<br>
^ self].<br>
closeBox := SystemWindowButton new target: self;<br>
actionSelector: #delete;<br>
labelGraphic: self class closeBoxImage;<br>
color: Color transparent;<br>
extent: self class closeBoxImage extent;<br>
borderWidth: 0.<br>
pinBox := SystemWindowButton new target: self;<br>
actionSelector: #stayUp:;<br>
arguments: {true};<br>
labelGraphic: self class pushPinImage;<br>
color: Color transparent;<br>
extent: self class pushPinImage extent;<br>
borderWidth: 0.<br>
Preferences noviceMode<br>
ifTrue: [closeBox setBalloonText: 'close this menu'.<br>
pinBox setBalloonText: 'keep this menu up'].<br>
titleBarArea := AlignmentMorph newRow vResizing: #shrinkWrap;<br>
layoutInset: 3;<br>
+ color: MenuMorph menuTitleColor;<br>
- color: Preferences menuTitleColor;<br>
addMorphBack: closeBox;<br>
addMorphBack: title;<br>
addMorphBack: pinBox.<br>
<br>
title color: Color transparent.<br>
<br>
titleString := title<br>
findDeepSubmorphThat: [:each | each respondsTo: #font: ]<br>
ifAbsent: [StringMorph contents: String empty].<br>
titleString font: Preferences windowTitleFont.<br>
self wantsRoundedCorners<br>
ifTrue: [titleBarArea useRoundedCorners].<br>
<br>
self addMorphFront: titleBarArea.<br>
titleBarArea setProperty: #titleString toValue: (title valueOfProperty: #titleString).<br>
title removeProperty: #titleString.<br>
self setProperty: #hasTitlebarWidgets toValue: true.<br>
self removeProperty: #needsTitlebarWidgets.<br>
self removeStayUpItems!<br>
<br>
Item was changed:<br>
----- Method: MenuMorph>>addTitle:icon:updatingSelector:updateTarget: (in category 'construction') -----<br>
addTitle: aString icon: aForm updatingSelector: aSelector updateTarget: aTarget<br>
"Add a title line at the top of this menu Make aString its initial<br>
contents.<br>
If aSelector is not nil, then periodically obtain fresh values for<br>
its<br>
contents by sending aSelector to aTarget.."<br>
| title titleContainer |<br>
title := AlignmentMorph newColumn.<br>
self setTitleParametersFor: title.<br>
""<br>
aForm isNil<br>
ifTrue: [titleContainer := title]<br>
ifFalse: [| pair |<br>
pair := AlignmentMorph newRow.<br>
<br>
pair color: Color transparent.<br>
pair hResizing: #shrinkWrap.<br>
pair layoutInset: 0.<br>
+ pair addMorphBack: (Morph new extent: 5@5; color: Color transparent). "padding"<br>
- ""<br>
pair addMorphBack: aForm asMorph.<br>
+ pair addMorphBack: (Morph new extent: 5@5; color: Color transparent). "padding"<br>
- ""<br>
titleContainer := AlignmentMorph newColumn.<br>
titleContainer color: Color transparent.<br>
titleContainer vResizing: #shrinkWrap.<br>
titleContainer wrapCentering: #center.<br>
titleContainer cellPositioning: #topCenter.<br>
titleContainer layoutInset: 0.<br>
pair addMorphBack: titleContainer.<br>
""<br>
title addMorphBack: pair].<br>
""<br>
aSelector<br>
ifNil: [""<br>
aString asString<br>
linesDo: [:line | titleContainer<br>
addMorphBack: ((StringMorph<br>
contents: line<br>
font: Preferences standardMenuFont)<br>
color: (Color black);<br>
yourself)]]<br>
ifNotNil: [| usm |<br>
usm := UpdatingStringMorph on: aTarget selector: aSelector.<br>
usm font: Preferences standardMenuFont.<br>
usm useStringFormat.<br>
usm lock.<br>
titleContainer addMorphBack: usm].<br>
""<br>
title setProperty: #titleString toValue: aString.<br>
self addMorphFront: title.<br>
""<br>
title useSquareCorners.<br>
(self hasProperty: #needsTitlebarWidgets)<br>
ifTrue: [self addStayUpIcons]!<br>
<br>
Item was changed:<br>
----- Method: MenuMorph>>setTitleParametersFor: (in category 'initialization') -----<br>
setTitleParametersFor: aMenuTitle<br>
| menuTitleColor menuTitleBorderColor |<br>
self wantsRoundedCorners<br>
ifTrue: [aMenuTitle useRoundedCorners].<br>
<br>
menuTitleColor := Preferences menuColorFromWorld<br>
ifTrue: [self color darker]<br>
+ ifFalse: [MenuMorph menuTitleColor].<br>
- ifFalse: [Preferences menuTitleColor].<br>
<br>
menuTitleBorderColor := Preferences menuAppearance3d<br>
ifTrue: [#inset]<br>
ifFalse: [Preferences menuColorFromWorld<br>
ifTrue: [self color darker muchDarker]<br>
+ ifFalse: [MenuMorph menuTitleBorderColor]].<br>
- ifFalse: [Preferences menuTitleBorderColor]].<br>
<br>
aMenuTitle<br>
setColor: menuTitleColor<br>
+ borderWidth: MenuMorph menuTitleBorderWidth<br>
- borderWidth: Preferences menuTitleBorderWidth<br>
borderColor: menuTitleBorderColor;<br>
vResizing: #shrinkWrap;<br>
wrapCentering: #center;<br>
cellPositioning: #topCenter;<br>
layoutInset: 0.<br>
!<br>
<br>
<br>
</blockquote></div><br></div>