Smalltalk › Squeak › Squeak - Dev

The Trunk: Morphic-tpr.1060.mcz

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

2 messages Options

commits-2

The Trunk: Morphic-tpr.1060.mcz

tim Rowledge uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-tpr.1060.mcz

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

Name: Morphic-tpr.1060
Author: tpr
Time: 20 December 2015, 10:57:42.928 am
UUID: c999504e-8f74-4941-a116-911eb62f0c74
Ancestors: Morphic-tpr.1059, Morphic-mt.1059

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.

=============== Diff against Morphic-tpr.1059 ===============

Item was changed:
----- Method: Form>>scaledIntoFormOfSize:smoothing: (in category '*Morphic') -----
scaledIntoFormOfSize: aNumberOrPoint smoothing: factor
"Scale and center the receiver into a form of a given size"

| extent scaledForm result |

extent := aNumberOrPoint asPoint.
extent = self extent ifTrue: [^ self copy].

scaledForm := self scaledToSize: extent smoothing: factor.

+ result := self species extent: extent depth: self depth.
- result := self species extent: extent depth: 32.
result getCanvas
translucentImage: scaledForm
at: extent - scaledForm extent // 2.

^ result
!

Chris Muller-3

Re: The Trunk: Morphic-tpr.1060.mcz

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.

'copy image versions here' does exactly what its meant to and what it says it does.

On Sun, Dec 20, 2015 at 12:58 PM, <[hidden email]> wrote:

tim Rowledge uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-tpr.1060.mcz

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

Name: Morphic-tpr.1060
Author: tpr
Time: 20 December 2015, 10:57:42.928 am
UUID: c999504e-8f74-4941-a116-911eb62f0c74
Ancestors: Morphic-tpr.1059, Morphic-mt.1059

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.

=============== Diff against Morphic-tpr.1059 ===============

Item was changed:
----- Method: Form>>scaledIntoFormOfSize:smoothing: (in category '*Morphic') -----
scaledIntoFormOfSize: aNumberOrPoint smoothing: factor
"Scale and center the receiver into a form of a given size"

| extent scaledForm result |

extent := aNumberOrPoint asPoint.
extent = self extent ifTrue: [^ self copy].

scaledForm := self scaledToSize: extent smoothing: factor.

+ result := self species extent: extent depth: self depth.
- result := self species extent: extent depth: 32.
result getCanvas
translucentImage: scaledForm
at: extent - scaledForm extent // 2.

^ result
!