<div dir="ltr">When mistakes like this happen, I think its better to revert to the ancestor and try again, rather than embalm these kinds of meta-notes forever into the history.<div><br></div><div><span style="font-size:13.3333339691162px">'copy image versions here' does exactly what its meant to and what it says it does.</span><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Dec 20, 2015 at 12:58 PM, <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">tim Rowledge uploaded a new version of Morphic to project The Trunk:<br>
<a href="http://source.squeak.org/trunk/Morphic-tpr.1060.mcz" rel="noreferrer" target="_blank">http://source.squeak.org/trunk/Morphic-tpr.1060.mcz</a><br>
<br>
==================== Summary ====================<br>
<br>
Name: Morphic-tpr.1060<br>
Author: tpr<br>
Time: 20 December 2015, 10:57:42.928 am<br>
UUID: c999504e-8f74-4941-a116-911eb62f0c74<br>
Ancestors: Morphic-tpr.1059, Morphic-mt.1059<br>
<br>
Attempt to correct stupid (probably( mistake in MC usage; I used the 'copy image versions here' menu item in the belief it would do something more sensible than simply copy a file. This clashed with marcel's change and so this is an attempt to re-merge and save a proper version.<br>
<br>
=============== Diff against Morphic-tpr.1059 ===============<br>
<br>
Item was changed:<br>
----- Method: Form>>scaledIntoFormOfSize:smoothing: (in category '*Morphic') -----<br>
scaledIntoFormOfSize: aNumberOrPoint smoothing: factor<br>
"Scale and center the receiver into a form of a given size"<br>
<br>
| extent scaledForm result |<br>
<br>
extent := aNumberOrPoint asPoint.<br>
extent = self extent ifTrue: [^ self copy].<br>
<br>
scaledForm := self scaledToSize: extent smoothing: factor.<br>
<br>
+ result := self species extent: extent depth: self depth.<br>
- result := self species extent: extent depth: 32.<br>
result getCanvas<br>
translucentImage: scaledForm<br>
at: extent - scaledForm extent // 2.<br>
<br>
^ result<br>
!<br>
<br>
<br>
</blockquote></div><br></div>