Packages April 2017

packages@lists.squeakfoundation.org

1 participants
121 discussions

The Trunk: 60Deprecated-pre.5.mcz
by commits＠source.squeak.org 27 Apr '17

27 Apr '17

Patrick Rein uploaded a new version of 60Deprecated to project The Trunk: http://source.squeak.org/trunk/60Deprecated-pre.5.mcz ==================== Summary ==================== Name: 60Deprecated-pre.5 Author: pre Time: 27 April 2017, 5:56:07.04166 pm UUID: 261605f7-1b50-5946-8137-14c6c9e75bf9 Ancestors: 60Deprecated-ul.4 Adds classes ContextPart, BlockContext, and MethodContext to the 60Deprecated package to ensure backwards compatibility =============== Diff against 60Deprecated-ul.4 =============== Item was changed: + SystemOrganization addCategory: #'60Deprecated-Kernel-Methods'! SystemOrganization addCategory: #'60Deprecated-System-Support'! Item was added: + ContextPart variableSubclass: #BlockContext + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: '60Deprecated-Kernel-Methods'! Item was added: + Context variableSubclass: #ContextPart + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: '60Deprecated-Kernel-Methods'! Item was added: + ContextPart variableSubclass: #MethodContext + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: '60Deprecated-Kernel-Methods'!

1 0

The Trunk: Collections-ul.753.mcz
by commits＠source.squeak.org 27 Apr '17

27 Apr '17

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.753.mcz ==================== Summary ==================== Name: Collections-ul.753 Author: ul Time: 27 April 2017, 12:08:58.187065 am UUID: 9c169c46-7fca-4bd9-a1d2-12ebd52b93a8 Ancestors: Collections-nice.752 - minor tweaks for String class >> #compare:with:collated: and String >> #findSubstring:in:startingAt:matchTable: =============== Diff against Collections-nice.752 =============== Item was changed: ----- Method: String class>>compare:with:collated: (in category 'primitives') ----- compare: string1 with: string2 collated: order "Return 1, 2 or 3, if string1 is <, =, or > string2, with the collating order of characters given by the order array." + | c1 c2 length1 length2 | + length1 := string1 size. + length2 := string2 size. + (order == nil or: [ order == AsciiOrder ]) ifTrue: [ "AsciiOrder is the identity function" + 1 to: (length1 min: length2) do: [ :i | + (c1 := string1 basicAt: i) = (c2 := string2 basicAt: i) ifFalse: [ + c1 < c2 + ifTrue: [ ^1 ] + ifFalse: [ ^3 ] ] ]. + length1 = length2 ifTrue: [ ^2 ]. + length1 < length2 + ifTrue: [ ^1 ] + ifFalse: [ ^3 ] ]. + 1 to: (length1 min: length2) do: [ :i | + (c1 := string1 basicAt: i) < 256 ifTrue: [ c1 := order at: c1 + 1 ]. + (c2 := string2 basicAt: i) < 256 ifTrue: [ c2 := order at: c2 + 1 ]. + c1 = c2 ifFalse:[ + c1 < c2 + ifTrue: [ ^1 ] + ifFalse: [ ^3 ] ] ]. + length1 = length2 ifTrue: [ ^2 ]. + length1 < length2 + ifTrue: [ ^1 ] + ifFalse: [ ^3 ].! - | len1 len2 c1 c2 | - order == nil ifTrue: [ - len1 := string1 size. - len2 := string2 size. - 1 to: (len1 min: len2) do:[:i | - c1 := string1 basicAt: i. - c2 := string2 basicAt: i. - c1 = c2 ifFalse: [c1 < c2 ifTrue: [^ 1] ifFalse: [^ 3]]. - ]. - len1 = len2 ifTrue: [^ 2]. - len1 < len2 ifTrue: [^ 1] ifFalse: [^ 3]. - ]. - len1 := string1 size. - len2 := string2 size. - 1 to: (len1 min: len2) do:[:i | - c1 := string1 basicAt: i. - c2 := string2 basicAt: i. - c1 < 256 ifTrue: [c1 := order at: c1 + 1]. - c2 < 256 ifTrue: [c2 := order at: c2 + 1]. - c1 = c2 ifFalse:[c1 < c2 ifTrue: [^ 1] ifFalse: [^ 3]]. - ]. - len1 = len2 ifTrue: [^ 2]. - len1 < len2 ifTrue: [^ 1] ifFalse: [^ 3]. - ! Item was changed: ----- Method: String>>findSubstring:in:startingAt:matchTable: (in category 'accessing') ----- findSubstring: key in: body startingAt: start matchTable: matchTable "Answer the index in the string body at which the substring key first occurs, at or beyond start. The match is determined using matchTable, which can be used to effect, eg, case-insensitive matches. If no match is found, zero will be returned." | index c1 c2 keySize matchTableSize | (keySize := key size) = 0 ifTrue: [ ^0 ]. matchTable ifNil: [ + start to: body size - keySize + 1 do: [ :startIndex | - start to: body size - key size + 1 do: [ :startIndex | index := 0. [ (body at: startIndex + index) == (key at: (index := index + 1)) ] whileTrue: [ index = keySize ifTrue: [ ^startIndex ] ] ]. ^0 ]. matchTableSize := matchTable size. + start to: body size - keySize + 1 do: [ :startIndex | - start to: body size - key size + 1 do: [ :startIndex | index := 0. [ + (c1 := (body basicAt: startIndex + index) + 1) <= matchTableSize ifTrue: [ - (c1 := (body at: startIndex + index) asInteger + 1) <= matchTableSize ifTrue: [ c1 := matchTable at: c1 ]. + (c2 := (key basicAt: (index := index + 1)) + 1) <= matchTableSize ifTrue: [ - (c2 := (key at: (index := index + 1)) asInteger + 1) <= matchTableSize ifTrue: [ c2 := matchTable at: c2 ]. c1 = c2 ] whileTrue: [ index = keySize ifTrue: [ ^startIndex ] ] ]. ^0!

1 0

The Trunk: EToys-ul.298.mcz
by commits＠source.squeak.org 27 Apr '17

27 Apr '17

Levente Uzonyi uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-ul.298.mcz ==================== Summary ==================== Name: EToys-ul.298 Author: ul Time: 27 April 2017, 1:02:38.02162 pm UUID: d4ecbed2-60da-4651-b11b-b6ecd27bee67 Ancestors: EToys-nice.297 - removed some of the extension methods, mostly those which have already been removed from the Trunk - removed #fixTemps sends - use the generic quicksort implementation in ChessMoveList =============== Diff against EToys-nice.297 =============== Item was removed: - ----- Method: Behavior>>indexIfCompact (in category '*Etoys-Squeakland-private') ----- - indexIfCompact - "If these 5 bits are non-zero, then instances of this class - will be compact. It is crucial that there be an entry in - Smalltalk compactClassesArray for any class so optimized. - See the msgs becomeCompact and becomeUncompact." - ^ (format bitShift: -11) bitAnd: 16r1F - " - Smalltalk compactClassesArray doWithIndex: - [:c :i | c == nil ifFalse: - [c indexIfCompact = i ifFalse: [self halt]]] - "! Item was changed: ----- Method: BroomMorph>>filter: (in category 'accessing') ----- filter: aBlock "Set my acceptance filter. aBlock should return true for all Morphs to be moved" + filter := aBlock! - filter := aBlock fixTemps! Item was removed: - ----- Method: ByteString>>primitiveFindSubstring:in:startingAt:matchTable: (in category '*Etoys-Squeakland-comparing') ----- - primitiveFindSubstring: key in: body startingAt: start matchTable: matchTable - "Answer the index in the string body at which the substring key first occurs, at or beyond start. The match is determined using matchTable, which can be used to effect, eg, case-insensitive matches. If no match is found, zero will be returned. - - The algorithm below is not optimum -- it is intended to be translated to C which will go so fast that it wont matter." - | index | - <primitive: 'primitiveFindSubstring' module: 'MiscPrimitivePlugin'> - <var: #key declareC: 'unsigned char *key'> - <var: #body declareC: 'unsigned char *body'> - <var: #matchTable declareC: 'unsigned char *matchTable'> - - key size = 0 ifTrue: [^ 0]. - start to: body size - key size + 1 do: - [:startIndex | - index := 1. - [(matchTable at: (body at: startIndex+index-1) asciiValue + 1) - = (matchTable at: (key at: index) asciiValue + 1)] - whileTrue: - [index = key size ifTrue: [^ startIndex]. - index := index+1]]. - ^ 0 - " - ' ' findSubstring: 'abc' in: 'abcdefabcd' startingAt: 1 matchTable: CaseSensitiveOrder 1 - ' ' findSubstring: 'abc' in: 'abcdefabcd' startingAt: 2 matchTable: CaseSensitiveOrder 7 - ' ' findSubstring: 'abc' in: 'abcdefabcd' startingAt: 8 matchTable: CaseSensitiveOrder 0 - ' ' findSubstring: 'abc' in: 'abcdefABcd' startingAt: 2 matchTable: CaseSensitiveOrder 0 - ' ' findSubstring: 'abc' in: 'abcdefABcd' startingAt: 2 matchTable: CaseInsensitiveOrder 7 - "! Item was removed: - ----- Method: Character>>asUnicodeChar (in category '*Etoys-Squeakland-converting') ----- - asUnicodeChar - "@@@ FIXME: Make this use asUnicode and move it to its lonely sender @@@" - | table charset v | - self leadingChar = 0 ifTrue: [^ self asInteger]. - charset := EncodedCharSet charsetAt: self leadingChar. - charset isCharset ifFalse: [^ self]. - table := charset ucsTable. - table isNil ifTrue: [^ Character value: 16rFFFD]. - - v := table at: self charCode + 1. - v = -1 ifTrue: [^ Character value: 16rFFFD]. - - ^ Character leadingChar: charset unicodeLeadingChar code: v.! Item was removed: - ----- Method: ChessMoveList>>sort:to:using: (in category 'sorting') ----- - sort: i to: j using: sorter - "Sort elements i through j of self to be nondescending according to sorter." - - | di dij dj tt ij k l n | - "The prefix d means the data at that index." - (n := j + 1 - i) <= 1 ifTrue: [^self]. "Nothing to sort." - "Sort di,dj." - di := collection at: i. - dj := collection at: j. - (sorter sorts: di before: dj) ifFalse:["i.e., should di precede dj?" - collection swap: i with: j. - tt := di. di := dj. dj := tt]. - n > 2 ifTrue:["More than two elements." - ij := (i + j) // 2. "ij is the midpoint of i and j." - dij := collection at: ij. "Sort di,dij,dj. Make dij be their median." - (sorter sorts: di before: dij) ifTrue:["i.e. should di precede dij?" - (sorter sorts: dij before: dj) "i.e., should dij precede dj?" - ifFalse:[collection swap: j with: ij. - dij := dj]. - ] ifFalse:[ "i.e. di should come after dij" - collection swap: i with: ij. - dij := di - ]. - n > 3 ifTrue:["More than three elements." - "Find k>i and l<j such that dk,dij,dl are in reverse order. - Swap k and l. Repeat this procedure until k and l pass each other." - k := i. l := j. - [ - [l := l - 1. k <= l and: [sorter sorts: dij before: (collection at: l)]] - whileTrue. "i.e. while dl succeeds dij" - [k := k + 1. k <= l and: [sorter sorts: (collection at: k) before: dij]] - whileTrue. "i.e. while dij succeeds dk" - k <= l - ] whileTrue:[collection swap: k with: l]. - "Now l<k (either 1 or 2 less), and di through dl are all less than - or equal to dk through dj. Sort those two segments." - self sort: i to: l using: sorter. - self sort: k to: j using: sorter]]. - ! Item was changed: ----- Method: ChessMoveList>>sortUsing: (in category 'sorting') ----- sortUsing: historyTable + + ^collection + quickSortFrom: startIndex + to: readLimit + by: [ :a :b | historyTable sorts: a before: b ]! - ^self sort: startIndex to: readLimit using: historyTable! Item was removed: - ----- Method: Delay>>scheduleEvent (in category '*Etoys-Squeakland-private') ----- - scheduleEvent - "Schedule this delay" - resumptionTime := Time millisecondClockValue + delayDuration. - AccessProtect critical:[ - ScheduledDelay := self. - TimingSemaphore signal. - ].! Item was removed: - ----- Method: Dictionary>>errorKeyNotFound (in category '*Etoys-Squeakland-private') ----- - errorKeyNotFound - - self error: 'key not found'! Item was removed: - ----- Method: Dictionary>>keyAt: (in category '*Etoys-Squeakland-private') ----- - keyAt: index - "May be overridden by subclasses so that fixCollisions will work" - | assn | - assn := array at: index. - assn == nil ifTrue: [^ nil] - ifFalse: [^ assn key]! Item was removed: - ----- Method: Dictionary>>noCheckAdd: (in category '*Etoys-Squeakland-private') ----- - noCheckAdd: anObject - "Must be defined separately for Dictionary because (self findElementOrNil:) expects a key, not an association. 9/7/96 tk" - - array at: (self findElementOrNil: anObject key) put: anObject. - tally := tally + 1! Item was changed: ----- Method: FileList2 class>>buildFileTypeButtons:actionRow:fileList: (in category '*Etoys-Squeakland-blue ui') ----- buildFileTypeButtons: window actionRow: actionRow fileList: aFileList | fileTypeInfo fileTypeButtons fileTypeRow aButton | fileTypeInfo := self endingSpecs. fileTypeRow := window addARowCentered: #(). fileTypeRow color: ScriptingSystem paneColor. fileTypeRow layoutInset: 3 @ 3. fileTypeRow cellInset: 2 @ 0. fileTypeRow hResizing: #spaceFill. fileTypeButtons := fileTypeInfo collect: [:each | aButton := self buildButtonText: each first balloonText: nil receiver: aFileList selector: #update:fileTypeRow:morphUp:. aButton arguments: {actionRow. fileTypeRow. aButton}. aButton setProperty: #enabled toValue: true. aButton setProperty: #buttonText toValue: each first. aButton]. fileTypeRow addAllMorphs: fileTypeButtons. aFileList directoryChangeBlock: [:newDir | self enableTypeButtons: fileTypeButtons info: fileTypeInfo + forDir: newDir]. - forDir: newDir] fixTemps. ! Item was removed: - ----- Method: OrderedCollection>>errorConditionNotSatisfied (in category '*Etoys-Squeakland-private') ----- - errorConditionNotSatisfied - - self error: 'no element satisfies condition'! Item was removed: - ----- Method: OrderedCollection>>grow (in category '*Etoys-Squeakland-adding') ----- - grow - "Become larger. Typically, a subclass has to override this if the subclass - adds instance variables." - | newArray | - newArray := Array new: self size + self growSize. - newArray replaceFrom: 1 to: array size with: array startingAt: 1. - array := newArray! Item was removed: - ----- Method: OrderedCollection>>growSize (in category '*Etoys-Squeakland-adding') ----- - growSize - ^ array size max: 2! Item was removed: - ----- Method: Random class>>theItsCompletelyBrokenTest (in category '*Etoys-Squeakland-testing') ----- - theItsCompletelyBrokenTest - "Random theItsCompletelyBrokenTest" - "The above should print as... - (0.149243269650845 0.331633021743797 0.75619644800024 0.393701540023881 0.941783181364547 0.549929193942775 0.659962596213428 0.991354559078512 0.696074432551896 0.922987899707159 ) - If they are not these values (accounting for precision of printing) then something is horribly wrong: DO NOT USE THIS CODE FOR ANYTHING. " - | rng | - rng := Random new. - rng seed: 2345678901. - ^ (1 to: 10) collect: [:i | rng next]! Item was removed: - ----- Method: Set>>init: (in category '*Etoys-Squeakland-private') ----- - init: n - "Initialize array to an array size of n" - array := Array new: n. - tally := 0! Item was removed: - ----- Method: Set>>keyAt: (in category '*Etoys-Squeakland-private') ----- - keyAt: index - "May be overridden by subclasses so that fixCollisions will work" - ^ array at: index! Item was removed: - ----- Method: Set>>noCheckAdd: (in category '*Etoys-Squeakland-private') ----- - noCheckAdd: anObject - array at: (self findElementOrNil: anObject) put: anObject. - tally := tally + 1! Item was removed: - ----- Method: Set>>swap:with: (in category '*Etoys-Squeakland-private') ----- - swap: oneIndex with: otherIndex - "May be overridden by subclasses so that fixCollisions will work" - - array swap: oneIndex with: otherIndex - ! Item was removed: - ----- Method: Set>>withArray: (in category '*Etoys-Squeakland-private') ----- - withArray: anArray - "private -- for use only in copy" - array := anArray! Item was removed: - ----- Method: SharedQueue>>init: (in category '*Etoys-Squeakland-private') ----- - init: size - - contentsArray := Array new: size. - readPosition := 1. - writePosition := 1. - accessProtect := Semaphore forMutualExclusion. - readSynch := Semaphore new! Item was removed: - ----- Method: String>>findLastOccuranceOfString:startingAt: (in category '*Etoys-Squeakland-deprecated-3.10') ----- - findLastOccuranceOfString: subString startingAt: start - "Answer the index of the last occurance of subString within the receiver, starting at start. If - the receiver does not contain subString, answer 0." - - ^ self findLastOccurrenceOfString: subString startingAt: start - !

1 0

The Trunk: ToolBuilder-Morphic-topa.193.mcz
by commits＠source.squeak.org 27 Apr '17

27 Apr '17

Tobias Pape uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-topa.193.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-topa.193 Author: topa Time: 27 April 2017, 10:03:36.534691 am UUID: 026d52d0-05a6-4b19-a951-01e2cfac7d5c Ancestors: ToolBuilder-Morphic-ul.192 Factoring the MorphicToolBuilder openning behavior =============== Diff against ToolBuilder-Morphic-ul.192 =============== Item was added: + ----- Method: DialogWindow>>morphicOpenWith: (in category '*ToolBuilder-Morphic-opening') ----- + morphicOpenWith: aMorphicToolBuilder + + ^ self + moveToHand; + getUserResponse! Item was added: + ----- Method: MenuMorph>>morphicOpenWith: (in category '*ToolBuilder-Morphic-opening') ----- + morphicOpenWith: aMorphicToolBuilder + + self popUpInWorld: World. + ^ super morphicOpenWith: aMorphicToolBuilder! Item was added: + ----- Method: Morph>>morphicOpenWith: (in category '*ToolBuilder-Morphic-opening') ----- + morphicOpenWith: aMorphicToolBuilder + + ^ self openInWorld! Item was changed: ----- Method: MorphicToolBuilder>>open: (in category 'opening') ----- open: anObject "Build and open the object. Answer the widget opened." | morph | + morph := anObject isMorph ifTrue: [anObject] ifFalse: [self build: anObject]. + ^ morph morphicOpenWith: self! - anObject isMorph - ifTrue:[morph := anObject] - ifFalse:[morph := self build: anObject]. - (morph isKindOf: MenuMorph) - ifTrue:[morph popUpInWorld: World]. - (morph isKindOf: DialogWindow) - ifTrue: [^ morph moveToHand; getUserResponse]. - (morph isKindOf: SystemWindow) - ifFalse:[morph openInWorld] - ifTrue:[ - morph := morph openInWorldExtent: morph extent. - (Project uiManager openToolsAttachedToMouseCursor - and: [self currentEvent isMouse and: [self currentEvent isMouseUp]]) - ifTrue: [ - morph setProperty: #initialDrop toValue: true. - morph hasDropShadow: false. - self currentHand attachMorph: morph]]. - ^morph! Item was added: + ----- Method: SystemWindow>>morphicOpenWith: (in category '*ToolBuilder-Morphic-opening') ----- + morphicOpenWith: aMorphicToolBuilder + + | morph | + morph := self openInWorldExtent: self extent. + (Project uiManager openToolsAttachedToMouseCursor + and: [ | event | + event := aMorphicToolBuilder currentEvent. + event isMouse and: [event isMouseUp]]) + ifTrue: [ + morph setProperty: #initialDrop toValue: true. + morph hasDropShadow: false. + aMorphicToolBuilder currentHand attachMorph: morph]. + ^ morph + !

1 0

The Trunk: Kernel-nice.1101.mcz
by commits＠source.squeak.org 26 Apr '17

26 Apr '17

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.1101.mcz ==================== Summary ==================== Name: Kernel-nice.1101 Author: nice Time: 26 April 2017, 11:32:58.822457 pm UUID: e7668d92-95a7-4ece-967a-35a6bf61c946 Ancestors: Kernel-eem.1100 Fix the dividend of ZeroDivide exception in case of reciprocal. Classify a few 'as yet unclassified' methods. =============== Diff against Kernel-eem.1100 =============== Item was changed: + ----- Method: ClassCommentReader>>scanFrom: (in category 'filein/Out') ----- - ----- Method: ClassCommentReader>>scanFrom: (in category 'as yet unclassified') ----- scanFrom: aStream "File in the class comment from aStream. Not string-i-fied, just a text, exactly as it is in the browser. Move to changes file." class theNonMetaClass classComment: (aStream nextChunkText) stamp: changeStamp "Writes it on the disk and saves a RemoteString ref"! Item was changed: + ----- Method: ClassCommentReader>>scanFrom:environment: (in category 'filein/Out') ----- - ----- Method: ClassCommentReader>>scanFrom:environment: (in category 'as yet unclassified') ----- scanFrom: aStream environment: anEnvironment ^ self scanFrom: aStream! Item was changed: + ----- Method: ClassCommentReader>>scanFromNoCompile: (in category 'filein/Out') ----- - ----- Method: ClassCommentReader>>scanFromNoCompile: (in category 'as yet unclassified') ----- scanFromNoCompile: aStream "File in the class comment from aStream. Not string-i-fied, just a text, exactly as it is in the browser. Move to changes file." self scanFrom: aStream. "for comments, the same as usual"! Item was changed: ----- Method: Complex>>reciprocal (in category 'arithmetic') ----- reciprocal "Answer 1 divided by the receiver. Create an error notification if the receiver is 0." self = 0 + ifTrue: [^ (ZeroDivide dividend: 1) signal] - ifTrue: [^ (ZeroDivide dividend: self) signal] ifFalse: [^1 / self] ! Item was changed: + ----- Method: Error>>defaultAction (in category 'handling') ----- - ----- Method: Error>>defaultAction (in category 'exceptionDescription') ----- defaultAction "No one has handled this error, but now give them a chance to decide how to debug it. If none handle this either then open debugger (see UnhandedError-defaultAction)" UnhandledError signalForException: self! Item was changed: ----- Method: Number>>raisedTo: (in category 'mathematical functions') ----- raisedTo: aNumber "Answer the receiver raised to aNumber." aNumber isInteger ifTrue: [ "Do the special case of integer power" ^ self raisedToInteger: aNumber]. aNumber isFraction ifTrue: [ "Special case for fraction power" ^ (self nthRoot: aNumber denominator) raisedToInteger: aNumber numerator ]. self negative ifTrue: [ ^ ArithmeticError signal: 'Negative numbers can''t be raised to float powers.' ]. aNumber isZero ifTrue: [^ self class one]. "Special case of exponent=0" 1 = aNumber ifTrue: [^ self]. "Special case of exponent=1" self isZero ifTrue: [ "Special case of self = 0" aNumber negative + ifTrue: [^ (ZeroDivide dividend: 1) signal] - ifTrue: [^ (ZeroDivide dividend: self) signal] ifFalse: [^ self]]. ^ (aNumber * self ln) exp "Otherwise use logarithms"!

1 0

The Trunk: MorphicTests-nice.40.mcz
by commits＠source.squeak.org 26 Apr '17

26 Apr '17

Nicolas Cellier uploaded a new version of MorphicTests to project The Trunk: http://source.squeak.org/trunk/MorphicTests-nice.40.mcz ==================== Summary ==================== Name: MorphicTests-nice.40 Author: nice Time: 26 April 2017, 11:18:11.635198 pm UUID: e709833d-000f-471c-abed-23c75c36b9ad Ancestors: MorphicTests-mt.39 Classify a few 'as yet unclassified' methods =============== Diff against MorphicTests-mt.39 =============== Item was changed: + ----- Method: CircleMorphBugs>>testCircleInstance (in category 'tests') ----- - ----- Method: CircleMorphBugs>>testCircleInstance (in category 'as yet unclassified') ----- testCircleInstance "" "self run: #testCircleInstance" | circ | self assert: (circ := CircleMorph initializedInstance) extent = circ extent x asPoint ! Item was changed: + ----- Method: LayoutFrameTest>>testInset (in category 'tests') ----- - ----- Method: LayoutFrameTest>>testInset (in category 'as yet unclassified') ----- testInset | lf rectangle | lf := LayoutFrame new leftFraction: 0 offset: 10; topFraction: 0 offset: 10; rightFraction: 1 offset: -10; bottomFraction: 1 offset: -10; yourself. rectangle := lf layout: nil in: (50@10 corner: 150@70). self assert: (60@20 corner: 140@60) = rectangle! Item was changed: + ----- Method: LayoutFrameTest>>testLeftTopAligned (in category 'tests') ----- - ----- Method: LayoutFrameTest>>testLeftTopAligned (in category 'as yet unclassified') ----- testLeftTopAligned | lf rectangle | lf := LayoutFrame new leftFraction: 0 offset: 10; topFraction: 0 offset: 10; rightFraction: 0 offset: 60; bottomFraction: 0 offset: 25; yourself. rectangle := lf layout: nil in: (50@10 corner: 150@70). self assert: (60@20 corner: 110@35) = rectangle! Item was changed: + ----- Method: LayoutFrameTest>>testRightBottomQuadrant (in category 'tests') ----- - ----- Method: LayoutFrameTest>>testRightBottomQuadrant (in category 'as yet unclassified') ----- testRightBottomQuadrant | lf rectangle | lf := LayoutFrame new leftFraction: 1/2 offset: 1; topFraction: 1/2 offset: 1; rightFraction: 1 offset: -2; bottomFraction: 1 offset: -2; yourself. rectangle := lf layout: nil in: (50@10 corner: 150@70). self assert: (101@41 corner: 148@68) = rectangle! Item was changed: + ----- Method: LayoutFrameTest>>testSpaceFill (in category 'tests') ----- - ----- Method: LayoutFrameTest>>testSpaceFill (in category 'as yet unclassified') ----- testSpaceFill | lf rectangle | lf := LayoutFrame new leftFraction: 0 offset: 0; topFraction: 0 offset: 0; rightFraction: 1 offset: 0; bottomFraction: 1 offset: 0; yourself. rectangle := lf layout: nil in: (50@10 corner: 150@70). self assert: (50@10 corner: 150@70) = rectangle! Item was changed: + ----- Method: MorphicTestTextModel>>flags (in category 'accessing') ----- - ----- Method: MorphicTestTextModel>>flags (in category 'as yet unclassified') ----- flags ^ flags ifNil: [flags := Bag new]! Item was changed: + ----- Method: MorphicTestTextModel>>hasFlag: (in category 'accessing') ----- - ----- Method: MorphicTestTextModel>>hasFlag: (in category 'as yet unclassified') ----- hasFlag: aSymbol ^ self flags includes: aSymbol! Item was changed: + ----- Method: MorphicTestTextModel>>result (in category 'accessing') ----- - ----- Method: MorphicTestTextModel>>result (in category 'as yet unclassified') ----- result ^ result! Item was changed: + ----- Method: MorphicTestTextModel>>result: (in category 'accessing') ----- - ----- Method: MorphicTestTextModel>>result: (in category 'as yet unclassified') ----- result: anObject result := anObject.! Item was changed: + ----- Method: MorphicUIManagerTest>>defaultTimeout (in category 'accessing') ----- - ----- Method: MorphicUIManagerTest>>defaultTimeout (in category 'as yet unclassified') ----- defaultTimeout ^ 60 "seconds"! Item was changed: + ----- Method: MorphicUIManagerTest>>findWindowInWorldLabeled: (in category 'private') ----- - ----- Method: MorphicUIManagerTest>>findWindowInWorldLabeled: (in category 'as yet unclassified') ----- findWindowInWorldLabeled: aLabel "Look in the world and in the hand for windows. Yes, windows may spawn in the hand." ^ World submorphs, (World hands gather: [:hand | hand submorphs]) detect: [ :each | each isSystemWindow and: [ each label = aLabel ] ] ifNone: [].! Item was changed: + ----- Method: MorphicUIManagerTest>>setUp (in category 'initialize-release') ----- - ----- Method: MorphicUIManagerTest>>setUp (in category 'as yet unclassified') ----- setUp "default. tests will add morphs to list. Teardown will delete." cases := #(). uiManager := MorphicUIManager new.! Item was changed: + ----- Method: MorphicUIManagerTest>>tearDown (in category 'initialize-release') ----- - ----- Method: MorphicUIManagerTest>>tearDown (in category 'as yet unclassified') ----- tearDown "default. tests will add morphs to list. Teardown will delete." cases do: [ :each | each delete ].! Item was changed: + ----- Method: MorphicUIManagerTest>>testOpenWorkspace (in category 'tests') ----- - ----- Method: MorphicUIManagerTest>>testOpenWorkspace (in category 'as yet unclassified') ----- testOpenWorkspace "self new testOpenWorkspace" "MorphicUIBugTest run: #testOpenWorkspace" | window myLabel foundWindow myModel | myLabel := 'Workspace from SUnit test' . foundWindow := self findWindowInWorldLabeled: myLabel . self assert: foundWindow isNil. window := uiManager edit: '"MorphicUIBugTest run: #openWorkspaceTest"' label: myLabel. foundWindow := self findWindowInWorldLabeled: myLabel. cases := Array with: foundWindow . "For teardown." myModel := foundWindow submorphs detect: #isMorphicModel. self assert: myModel model class == Workspace. self assert: foundWindow model class == Workspace.! Item was changed: + ----- Method: MorphicUIManagerTest>>testOpenWorkspaceAns (in category 'tests') ----- - ----- Method: MorphicUIManagerTest>>testOpenWorkspaceAns (in category 'as yet unclassified') ----- testOpenWorkspaceAns "Test if method opening a workspace answers the window opened" "MorphicUIBugTest run: #testOpenWorkspaceAns" | window myLabel foundWindow | myLabel := 'Workspace from ', 'SUnit test' . foundWindow := self findWindowInWorldLabeled: myLabel . self assert: ( foundWindow isNil ) . window := uiManager edit: '"MorphicUIBugTest run: #openWorkspaceTest"' label: myLabel. foundWindow := self findWindowInWorldLabeled: myLabel . cases := Array with: foundWindow . "For teardown." self assert: ( window == foundWindow ) .! Item was changed: + ----- Method: MorphicUIManagerTest>>testShowAllBinParts (in category 'tests') ----- - ----- Method: MorphicUIManagerTest>>testShowAllBinParts (in category 'as yet unclassified') ----- testShowAllBinParts "self new testShowAllBinParts" "MorphicUIBugTest run: #testShowAllBinParts" | tool | self shouldnt: [tool := ObjectsTool initializedInstance showAll openCenteredInWorld] raise: Error. cases := Array with: tool.! Item was changed: + ----- Method: MorphicUIManagerTest>>testUIManagerNoAcceptInitially (in category 'tests') ----- - ----- Method: MorphicUIManagerTest>>testUIManagerNoAcceptInitially (in category 'as yet unclassified') ----- testUIManagerNoAcceptInitially "Ensure that UIManager does not invoke the accept: action initially." | accepted window | accepted := false. window := uiManager edit: Text new label: 'Test' accept: [:val| accepted := true]. window delete. self deny: accepted.! Item was changed: + ----- Method: SimpleSwitchMorphTest>>classToBeTested (in category 'accessing') ----- - ----- Method: SimpleSwitchMorphTest>>classToBeTested (in category 'as yet unclassified') ----- classToBeTested ^ SimpleSwitchMorph ! Item was changed: + ----- Method: SimpleSwitchMorphTest>>setUp (in category 'initialize-release') ----- - ----- Method: SimpleSwitchMorphTest>>setUp (in category 'as yet unclassified') ----- setUp super setUp. testSwitch := SimpleSwitchMorph new! Item was changed: + ----- Method: SimpleSwitchMorphTest>>testName (in category 'tests') ----- - ----- Method: SimpleSwitchMorphTest>>testName (in category 'as yet unclassified') ----- testName self assert: testSwitch externalName = 'SimpleSwitch'! Item was changed: + ----- Method: SimpleSwitchMorphTest>>testState (in category 'tests') ----- - ----- Method: SimpleSwitchMorphTest>>testState (in category 'as yet unclassified') ----- testState self assert: testSwitch isOff. self deny: testSwitch isOn. testSwitch toggleState. self assert: testSwitch isOn. self deny: testSwitch isOff! Item was changed: + ----- Method: SimpleSwitchMorphTest>>testSwitching (in category 'tests') ----- - ----- Method: SimpleSwitchMorphTest>>testSwitching (in category 'as yet unclassified') ----- testSwitching testSwitch setSwitchState: false. self assert: testSwitch isOff. self assert: testSwitch color = testSwitch offColor. testSwitch setSwitchState: true. self assert: testSwitch isOn. self assert: testSwitch color = testSwitch onColor.! Item was changed: + ----- Method: StickynessBugz>>testForTiltedStickyness (in category 'tests') ----- - ----- Method: StickynessBugz>>testForTiltedStickyness (in category 'as yet unclassified') ----- testForTiltedStickyness "self new testForTiltedStickyness" "self run: #testForTiltedStickyness" | m | m := RectangleMorph new openCenteredInWorld . cases := Array with: m . "save for tear down." self assert: ( m topRendererOrSelf isSticky not ) . m beSticky . self assert: ( m topRendererOrSelf isSticky ) . m addFlexShell . cases := Array with: m topRendererOrSelf . m topRendererOrSelf rotationDegrees: 45.0 . self assert: ( m topRendererOrSelf isSticky ) . m beUnsticky . self assert: ( m topRendererOrSelf isSticky not ) . m topRendererOrSelf delete. ^true ! Item was changed: + ----- Method: TestInWorldMorph>>initialize (in category 'initialization') ----- - ----- Method: TestInWorldMorph>>initialize (in category 'as yet unclassified') ----- initialize super initialize. outOfWorldCount := intoWorldCount := 0.! Item was changed: + ----- Method: TestInWorldMorph>>intoWorld: (in category 'accessing') ----- - ----- Method: TestInWorldMorph>>intoWorld: (in category 'as yet unclassified') ----- intoWorld: aWorld aWorld ifNil:[^self]. super intoWorld: aWorld. intoWorldCount := intoWorldCount + 1. ! Item was changed: + ----- Method: TestInWorldMorph>>intoWorldCount (in category 'accessing') ----- - ----- Method: TestInWorldMorph>>intoWorldCount (in category 'as yet unclassified') ----- intoWorldCount ^intoWorldCount! Item was changed: + ----- Method: TestInWorldMorph>>outOfWorld: (in category 'accessing') ----- - ----- Method: TestInWorldMorph>>outOfWorld: (in category 'as yet unclassified') ----- outOfWorld: aWorld aWorld ifNil:[^self]. super outOfWorld: aWorld. outOfWorldCount := outOfWorldCount + 1. ! Item was changed: + ----- Method: TestInWorldMorph>>outOfWorldCount (in category 'accessing') ----- - ----- Method: TestInWorldMorph>>outOfWorldCount (in category 'as yet unclassified') ----- outOfWorldCount ^outOfWorldCount! Item was changed: + ----- Method: UnimplementedCallBugz>>testPolyIntersect (in category 'tests') ----- - ----- Method: UnimplementedCallBugz>>testPolyIntersect (in category 'as yet unclassified') ----- testPolyIntersect "self run: #testPolyIntersect" "This should not throw an exception." PolygonMorph initializedInstance intersects: ( Rectangle center: Display center extent: 100 asPoint ).!

1 0

The Trunk: Kernel-eem.1100.mcz
by commits＠source.squeak.org 26 Apr '17

26 Apr '17

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.1100.mcz ==================== Summary ==================== Name: Kernel-eem.1100 Author: eem Time: 26 April 2017, 2:13:43.92511 pm UUID: d2281281-58ee-4fc0-a85f-32aa3c0063ca Ancestors: Kernel-ul.1099 Fix regression in Context printing introduced in Kernel-eem.1074 through Kernel-eem.1074 or there abouts. =============== Diff against Kernel-ul.1099 =============== Item was changed: ----- Method: Context>>printOn: (in category 'printing') ----- printOn: aStream | class mclass selector | method ifNil: [^super printOn: aStream]. closureOrNil ifNotNil: [aStream nextPutAll: '[] in '. + closureOrNil outerContext ifNotNil: + [:outer| + outer printOn: aStream. + ^self]]. - closureOrNil outerContext printOn: aStream]. class := self objectClass: self receiver. mclass := method methodClass. selector := method selector ifNil: [method defaultSelector]. aStream nextPutAll: class name. mclass ~~ class ifTrue: [aStream nextPut: $(; nextPutAll: mclass name; nextPut: $)]. aStream nextPutAll: '>>'; nextPutAll: selector. (selector == #doesNotUnderstand: and: [(self objectClass: (self tempAt: 1)) == Message]) ifTrue: [aStream space. (self tempAt: 1) selector printOn: aStream]!

1 0

The Trunk: EToys-nice.297.mcz
by commits＠source.squeak.org 26 Apr '17

26 Apr '17

Nicolas Cellier uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-nice.297.mcz ==================== Summary ==================== Name: EToys-nice.297 Author: nice Time: 26 April 2017, 11:12:27.059817 pm UUID: b8866d63-4f7a-405c-b8a6-ae7a05c271a9 Ancestors: EToys-nice.296 Favour usage of the regular #findLastOccurrenceOfString:startingAt: over the (un-)deprecated #findLastOccuranceOfString:startingAt: BIS =============== Diff against EToys-nice.296 =============== Item was changed: ----- Method: FileList>>removeVersionNumberFromFileName (in category '*Etoys-Squeakland-file menu action') ----- removeVersionNumberFromFileName "The selected filename has a version number in it. Rename the file such that the version number is removed." | localName fullName dotPosition beforeDot earlierDotPosition within newLocalName | fullName := directory fullNameFor: fileName. localName := FileDirectory localNameFor: fullName. + dotPosition := localName findLastOccurrenceOfString: FileDirectory dot startingAt: 1. - dotPosition := localName findLastOccuranceOfString: FileDirectory dot startingAt: 1. dotPosition > 0 ifTrue: [beforeDot := localName copyFrom: 1 to: dotPosition - 1. earlierDotPosition := beforeDot findLastOccurrenceOfString: FileDirectory dot startingAt: 1. earlierDotPosition > 0 ifTrue: [within := beforeDot copyFrom: (earlierDotPosition + 1) to: beforeDot size. (within size > 0 and: [within isAllDigits]) ifTrue: ["whew" newLocalName := (localName copyFrom: 1 to: (earlierDotPosition - 1)), (localName copyFrom: dotPosition to: localName size). (directory fileNames includes: newLocalName) ifTrue: [(self confirm: ('do you want to clobber the existing' translated, ' ', newLocalName, '?') orCancel: [^ self]) ifFalse: [^ self]. directory deleteFileNamed: localName]. directory rename: localName toBe: newLocalName. self updateFileList]]]. !

1 0

The Trunk: MorphicExtras-nice.206.mcz
by commits＠source.squeak.org 26 Apr '17

26 Apr '17

Nicolas Cellier uploaded a new version of MorphicExtras to project The Trunk: http://source.squeak.org/trunk/MorphicExtras-nice.206.mcz ==================== Summary ==================== Name: MorphicExtras-nice.206 Author: nice Time: 26 April 2017, 11:05:07.705923 pm UUID: d16239c9-452c-4885-93f9-0e7f7d6c59f8 Ancestors: MorphicExtras-ul.205 Classify a few 'as yet unclassified' methods =============== Diff against MorphicExtras-ul.205 =============== Item was changed: + ----- Method: AbstractMediaEventMorph>>endTime (in category 'accessing') ----- - ----- Method: AbstractMediaEventMorph>>endTime (in category 'as yet unclassified') ----- endTime ^endTimeInScore ifNil: [startTimeInScore + 100]! Item was changed: + ----- Method: DescriptionForPartsBin>>categories (in category 'accessing') ----- - ----- Method: DescriptionForPartsBin>>categories (in category 'access') ----- categories "Answer the categoryList of the receiver" ^ categoryList! Item was changed: + ----- Method: DescriptionForPartsBin>>documentation (in category 'accessing') ----- - ----- Method: DescriptionForPartsBin>>documentation (in category 'access') ----- documentation "Answer the documentation of the receiver" ^ documentation! Item was changed: + ----- Method: DescriptionForPartsBin>>formalName (in category 'accessing') ----- - ----- Method: DescriptionForPartsBin>>formalName (in category 'access') ----- formalName "Answer the formalName of the receiver" ^ formalName! Item was changed: + ----- Method: DescriptionForPartsBin>>globalReceiverSymbol (in category 'accessing') ----- - ----- Method: DescriptionForPartsBin>>globalReceiverSymbol (in category 'access') ----- globalReceiverSymbol "Answer the globalReceiverSymbol of the receiver" ^ globalReceiverSymbol! Item was changed: + ----- Method: DescriptionForPartsBin>>nativitySelector (in category 'accessing') ----- - ----- Method: DescriptionForPartsBin>>nativitySelector (in category 'access') ----- nativitySelector "Answer the nativitySelector of the receiver" ^ nativitySelector! Item was changed: + ----- Method: DescriptionForPartsBin>>translatedCategories (in category 'accessing') ----- - ----- Method: DescriptionForPartsBin>>translatedCategories (in category 'access') ----- translatedCategories "Answer translated the categoryList of the receiver" ^ self categories collect: [:each | each translated]! Item was changed: + ----- Method: EnvelopeLineMorph>>vertices:borderWidth:borderColor: (in category 'initialization') ----- - ----- Method: EnvelopeLineMorph>>vertices:borderWidth:borderColor: (in category 'as yet unclassified') ----- vertices: verts borderWidth: bw borderColor: bc super initialize. vertices := verts. borderWidth := bw. borderColor := bc. closed := false. arrows := #none. self computeBounds! Item was changed: + ----- Method: FancyMailComposition>>subject (in category 'accessing') ----- - ----- Method: FancyMailComposition>>subject (in category 'access') ----- subject ^subject ! Item was changed: + ----- Method: FancyMailComposition>>subject: (in category 'accessing') ----- - ----- Method: FancyMailComposition>>subject: (in category 'access') ----- subject: x subject := x. self changed: #subject. ^true! Item was changed: + ----- Method: FancyMailComposition>>to (in category 'accessing') ----- - ----- Method: FancyMailComposition>>to (in category 'access') ----- to ^to! Item was changed: + ----- Method: FancyMailComposition>>to: (in category 'accessing') ----- - ----- Method: FancyMailComposition>>to: (in category 'access') ----- to: x to := x. self changed: #to. ^true ! Item was changed: + ----- Method: FlexMorph>>changeBorderColor: (in category 'menus') ----- - ----- Method: FlexMorph>>changeBorderColor: (in category 'as yet unclassified') ----- changeBorderColor: evt | aHand | aHand := evt ifNotNil: [evt hand] ifNil: [self primaryHand]. self changeColorTarget: self selector: #borderColor: originalColor: self borderColor hand: aHand.! Item was changed: + ----- Method: FlexMorph>>changeBorderWidth: (in category 'menus') ----- - ----- Method: FlexMorph>>changeBorderWidth: (in category 'as yet unclassified') ----- changeBorderWidth: evt | handle origin aHand | aHand := evt ifNil: [self primaryHand] ifNotNil: [evt hand]. origin := aHand position. handle := HandleMorph new forEachPointDo: [:newPoint | handle removeAllMorphs. handle addMorph: (LineMorph from: origin to: newPoint color: Color black width: 1). self borderWidth: (newPoint - origin) r asInteger // 5]. aHand attachMorph: handle. handle startStepping! Item was changed: + ----- Method: FlexMorph>>loadOriginalForm (in category 'private') ----- - ----- Method: FlexMorph>>loadOriginalForm (in category 'as yet unclassified') ----- loadOriginalForm originalForm ifNil: [self updateFromOriginal]. ! Item was changed: + ----- Method: FlexMorph>>originalMorph (in category 'accessing') ----- - ----- Method: FlexMorph>>originalMorph (in category 'as yet unclassified') ----- originalMorph ^ originalMorph! Item was changed: + ----- Method: FlexMorph>>originalMorph: (in category 'accessing') ----- - ----- Method: FlexMorph>>originalMorph: (in category 'as yet unclassified') ----- originalMorph: aMorph originalMorph := aMorph. scalePoint := 0.25(a)0.25. self updateFromOriginal.! Item was changed: + ----- Method: FlexMorph>>updateFromOriginal (in category 'private') ----- - ----- Method: FlexMorph>>updateFromOriginal (in category 'as yet unclassified') ----- updateFromOriginal | intermediateForm | intermediateForm := originalMorph imageForm offset: 0@0. intermediateForm border: intermediateForm boundingBox widthRectangle: (borderWidth corner: borderWidth+1) rule: Form over fillColor: borderColor. self form: intermediateForm. originalMorph fullReleaseCachedState! Item was changed: + ----- Method: GraphicalMenu>>argument (in category 'accessing') ----- - ----- Method: GraphicalMenu>>argument (in category 'as yet unclassified') ----- argument ^argument! Item was changed: + ----- Method: GraphicalMenu>>argument: (in category 'accessing') ----- - ----- Method: GraphicalMenu>>argument: (in category 'as yet unclassified') ----- argument: anObject argument := anObject! Item was changed: + ----- Method: GraphicalMenu>>cancel (in category 'event handling') ----- - ----- Method: GraphicalMenu>>cancel (in category 'as yet unclassified') ----- cancel coexistWithOriginal ifTrue: [self delete] ifFalse: [owner replaceSubmorph: self topRendererOrSelf by: target]! Item was changed: + ----- Method: GraphicalMenu>>downArrowHit (in category 'event handling') ----- - ----- Method: GraphicalMenu>>downArrowHit (in category 'as yet unclassified') ----- downArrowHit currentIndex := currentIndex - 1. (currentIndex < 1) ifTrue: [currentIndex := formChoices size]. self updateThumbnail ! Item was changed: + ----- Method: GraphicalMenu>>okay (in category 'event handling') ----- - ----- Method: GraphicalMenu>>okay (in category 'as yet unclassified') ----- okay | nArgs | target ifNotNil:[ nArgs := selector numArgs. nArgs = 1 ifTrue:[target perform: selector with: (formChoices at: currentIndex)]. nArgs = 2 ifTrue:[target perform: selector with: (formChoices at: currentIndex) with: argument]]. coexistWithOriginal ifTrue: [self delete] ifFalse: [owner replaceSubmorph: self topRendererOrSelf by: target]! Item was changed: + ----- Method: GraphicalMenu>>selector (in category 'accessing') ----- - ----- Method: GraphicalMenu>>selector (in category 'as yet unclassified') ----- selector ^selector! Item was changed: + ----- Method: GraphicalMenu>>selector: (in category 'accessing') ----- - ----- Method: GraphicalMenu>>selector: (in category 'as yet unclassified') ----- selector: aSymbol selector := aSymbol! Item was changed: + ----- Method: GraphicalMenu>>upArrowHit (in category 'event handling') ----- - ----- Method: GraphicalMenu>>upArrowHit (in category 'as yet unclassified') ----- upArrowHit currentIndex := currentIndex + 1. (currentIndex > formChoices size) ifTrue: [currentIndex := 1]. self updateThumbnail ! Item was changed: + ----- Method: InterimSoundMorph>>addGraphic (in category 'initialization') ----- - ----- Method: InterimSoundMorph>>addGraphic (in category 'as yet unclassified') ----- addGraphic graphic := SketchMorph withForm: self speakerGraphic. graphic position: bounds center - (graphic extent // 2). self addMorph: graphic. ! Item was changed: + ----- Method: InterimSoundMorph>>sound (in category 'accessing') ----- - ----- Method: InterimSoundMorph>>sound (in category 'as yet unclassified') ----- sound ^ sound ! Item was changed: + ----- Method: InterimSoundMorph>>sound: (in category 'accessing') ----- - ----- Method: InterimSoundMorph>>sound: (in category 'as yet unclassified') ----- sound: aSound sound := aSound. ! Item was changed: + ----- Method: InterimSoundMorph>>speakerGraphic (in category 'initialization') ----- - ----- Method: InterimSoundMorph>>speakerGraphic (in category 'as yet unclassified') ----- speakerGraphic ^ Form extent: 19@18 depth: 8 fromArray: #(0 0 1493172224 2816 0 0 0 1493172224 11 0 0 138 1493172224 184549376 184549376 0 35509 2315255808 720896 720896 0 9090522 2315255808 2816 720896 0 2327173887 2315255819 2816 720896 138 3051028442 2315255819 2816 2816 1505080590 4294957786 2315255808 184549387 2816 3053453311 4292532917 1493172224 184549387 2816 1505080714 3048584629 1493172224 184549387 2816 9079434 3048584629 1493172224 184549387 2816 138 2327164341 1493172235 2816 2816 0 2324346293 1493172235 2816 720896 0 9079477 1493172224 2816 720896 0 35466 1493172224 720896 720896 0 138 0 184549376 184549376 0 0 0 11 0 0 0 0 2816 0) offset: 0@0 ! Item was changed: + ----- Method: MultiResolutionCanvas>>deferredMorphs (in category 'accessing') ----- - ----- Method: MultiResolutionCanvas>>deferredMorphs (in category 'as yet unclassified') ----- deferredMorphs ^deferredMorphs! Item was changed: + ----- Method: MultiResolutionCanvas>>deferredMorphs: (in category 'accessing') ----- - ----- Method: MultiResolutionCanvas>>deferredMorphs: (in category 'as yet unclassified') ----- deferredMorphs: aCollection deferredMorphs := aCollection! Item was changed: + ----- Method: MultiResolutionCanvas>>initializeFrom: (in category 'initialize-release') ----- - ----- Method: MultiResolutionCanvas>>initializeFrom: (in category 'as yet unclassified') ----- initializeFrom: aFormCanvas origin := aFormCanvas origin. clipRect := aFormCanvas privateClipRect. form := aFormCanvas form. port := aFormCanvas privatePort. shadowColor := aFormCanvas shadowColor. ! Item was changed: + ----- Method: SoundEventMorph>>sound: (in category 'accessing') ----- - ----- Method: SoundEventMorph>>sound: (in category 'as yet unclassified') ----- sound: aSound sound := aSound. self setBalloonText: 'a sound of duration ',(sound duration printShowingMaxDecimalPlaces: 1),' seconds'.! Item was changed: + ----- Method: SoundLoopMorph>>addCursorMorph (in category 'initialization') ----- - ----- Method: SoundLoopMorph>>addCursorMorph (in category 'as yet unclassified') ----- addCursorMorph self addMorph: (cursor := (RectangleMorph newBounds: (self innerBounds topLeft extent: 1@self innerBounds height) color: Color red) borderWidth: 0)! Item was changed: + ----- Method: SoundLoopMorph>>allowSubmorphExtraction (in category 'dropping/grabbing') ----- - ----- Method: SoundLoopMorph>>allowSubmorphExtraction (in category 'as yet unclassified') ----- allowSubmorphExtraction ^ true! Item was changed: + ----- Method: SoundLoopMorph>>buildSound (in category 'playing') ----- - ----- Method: SoundLoopMorph>>buildSound (in category 'as yet unclassified') ----- buildSound "Build a compound sound for the next iteration of the loop." | mixer soundMorphs | mixer := MixedSound new. mixer add: (RestSound dur: (self width - (2 * borderWidth)) / 128.0). soundMorphs := self submorphs select: [:m | m respondsTo: #sound]. soundMorphs do: [:m | | startTime pan | startTime := (m position x - (self left + borderWidth)) / 128.0. pan := (m position y - (self top + borderWidth)) asFloat / (self height - (2 * borderWidth) - m height). mixer add: ((RestSound dur: startTime), m sound copy) pan: pan]. ^ mixer ! Item was changed: + ----- Method: SoundLoopMorph>>play (in category 'playing') ----- - ----- Method: SoundLoopMorph>>play (in category 'as yet unclassified') ----- play "Play this sound to the sound ouput port in real time." self reset. SoundPlayer playSound: self. ! Item was changed: + ----- Method: SquishedNameMorph>>colorAroundName (in category 'drawing') ----- - ----- Method: SquishedNameMorph>>colorAroundName (in category 'as yet unclassified') ----- colorAroundName ^Color gray: 0.8! Item was changed: + ----- Method: SquishedNameMorph>>fontForName (in category 'drawing') ----- - ----- Method: SquishedNameMorph>>fontForName (in category 'as yet unclassified') ----- fontForName ^(TextStyle default fontOfSize: 15) emphasized: 1 ! Item was changed: + ----- Method: SquishedNameMorph>>isEditingName (in category 'drawing') ----- - ----- Method: SquishedNameMorph>>isEditingName (in category 'as yet unclassified') ----- isEditingName ^((self findA: UpdatingStringMorph) ifNil: [^false]) hasFocus ! Item was changed: + ----- Method: SquishedNameMorph>>stringToShow (in category 'drawing') ----- - ----- Method: SquishedNameMorph>>stringToShow (in category 'as yet unclassified') ----- stringToShow (target isNil or: [getSelector isNil]) ifTrue: [^'????']. ^target perform: getSelector! Item was changed: + ----- Method: SquishedNameMorph>>target:getSelector:setSelector: (in category 'initialization') ----- - ----- Method: SquishedNameMorph>>target:getSelector:setSelector: (in category 'as yet unclassified') ----- target: aTarget getSelector: symbol1 setSelector: symbol2 target := aTarget. getSelector := symbol1. setSelector := symbol2.! Item was changed: + ----- Method: StoryboardBookMorph>>changeTiltFactor: (in category 'private') ----- - ----- Method: StoryboardBookMorph>>changeTiltFactor: (in category 'as yet unclassified') ----- changeTiltFactor: x currentPage changeTiltFactor: x. panAndTiltFactor := x. ! Item was changed: + ----- Method: StoryboardBookMorph>>changeZoomFactor: (in category 'private') ----- - ----- Method: StoryboardBookMorph>>changeZoomFactor: (in category 'as yet unclassified') ----- changeZoomFactor: x currentPage changeZoomFactor: x. zoomFactor := x.! Item was changed: + ----- Method: StoryboardBookMorph>>getTiltFactor (in category 'private') ----- - ----- Method: StoryboardBookMorph>>getTiltFactor (in category 'as yet unclassified') ----- getTiltFactor ^panAndTiltFactor ifNil: [panAndTiltFactor := 0.5].! Item was changed: + ----- Method: StoryboardBookMorph>>getZoomFactor (in category 'private') ----- - ----- Method: StoryboardBookMorph>>getZoomFactor (in category 'as yet unclassified') ----- getZoomFactor ^zoomFactor ifNil: [zoomFactor := 0.5]! Item was changed: + ----- Method: StoryboardBookMorph>>offsetX (in category 'accessing') ----- - ----- Method: StoryboardBookMorph>>offsetX (in category 'as yet unclassified') ----- offsetX ^currentPage offsetX! Item was changed: + ----- Method: StoryboardBookMorph>>offsetX: (in category 'accessing') ----- - ----- Method: StoryboardBookMorph>>offsetX: (in category 'as yet unclassified') ----- offsetX: aNumber currentPage offsetX: aNumber! Item was changed: + ----- Method: StoryboardBookMorph>>offsetY (in category 'accessing') ----- - ----- Method: StoryboardBookMorph>>offsetY (in category 'as yet unclassified') ----- offsetY ^currentPage offsetY! Item was changed: + ----- Method: StoryboardBookMorph>>offsetY: (in category 'accessing') ----- - ----- Method: StoryboardBookMorph>>offsetY: (in category 'as yet unclassified') ----- offsetY: aNumber currentPage offsetY: aNumber! Item was changed: + ----- Method: StoryboardBookMorph>>scale (in category 'accessing') ----- - ----- Method: StoryboardBookMorph>>scale (in category 'as yet unclassified') ----- scale ^currentPage scale! Item was changed: + ----- Method: StoryboardBookMorph>>scale: (in category 'accessing') ----- - ----- Method: StoryboardBookMorph>>scale: (in category 'as yet unclassified') ----- scale: aValue currentPage scale: aValue! Item was changed: + ----- Method: TextOnCurve>>composeLinesFrom:withLines:atY: (in category 'composition') ----- - ----- Method: TextOnCurve>>composeLinesFrom:withLines:atY: (in category 'as yet unclassified') ----- composeLinesFrom: startingIndex withLines: startingLines atY: startingY "Here we determine the 'lines' of text that will fit along each segment of the curve. For each line, we determine its rectangle, then the dest wuadrilateral that it willbe rotated to. Then, we take the outer hull to determine a dest rectangle for WarpBlt. In addition we need the segment pivot point and angle, from which the source quadrilateral may be computed." | charIndex scanner line firstLine curveSegments segIndex pa pb segLen lineRect textSegments segDelta segAngle destRect destQuad i oldBounds | (oldBounds := container bounds) ifNotNil: [curve invalidRect: oldBounds]. charIndex := startingIndex. lines := startingLines. curveSegments := curve lineSegments. container textDirection < 0 ifTrue: [curveSegments := curveSegments reversed collect: [:seg | Array with: (seg second) with: seg first]]. textSegments := OrderedCollection new. scanner := SegmentScanner new text: text textStyle: textStyle. segIndex := 1. "For curves, segIndex is just an index." firstLine := true. pa := curveSegments first first. [charIndex <= text size and: [segIndex <= curveSegments size]] whileTrue: [curve isCurve ifFalse: [pa := (curveSegments at: segIndex) first]. pb := (curveSegments at: segIndex) last. segDelta := pb - pa. "Direction of this segment" segLen := segDelta r. lineRect := 0 @ 0 extent: segLen asInteger @ textStyle lineGrid. line := scanner composeFrom: charIndex inRectangle: lineRect firstLine: firstLine leftSide: true rightSide: true. line setRight: scanner rightX. line width > 0 ifTrue: [lines addLast: line. segAngle := segDelta theta. destQuad := line rectangle corners collect: [:p | (p translateBy: pa - (0 @ (line baseline + container baseline))) rotateBy: segAngle negated about: pa]. destRect := Rectangle encompassing: destQuad. textSegments addLast: (Array with: destRect truncated with: pa with: segAngle). pa := pa + ((pb - pa) * line width / segLen). charIndex := line last + 1]. segIndex := segIndex + 1. firstLine := false]. lines isEmpty ifTrue: ["No space in container or empty text" line := (TextLine start: startingIndex stop: startingIndex - 1 internalSpaces: 0 paddingWidth: 0) rectangle: (0 @ 0 extent: 10 @ textStyle lineGrid); lineHeight: textStyle lineGrid baseline: textStyle baseline. lines := Array with: line. textSegments addLast: (Array with: (curve vertices first extent: line rectangle extent) with: curve vertices first with: 0.0)]. "end of segments, now attempt word break." lines last last < text size ifTrue: [ [lines size > 1 and: [(text at: (i := lines last last) + 1) ~= Character space]] whileTrue: [i = lines last first ifTrue: [lines removeLast. textSegments removeLast] ifFalse: [lines last stop: i - 1]]]. lines := lines asArray. container textSegments: textSegments asArray. curve invalidRect: container bounds. ^maxRightX! Item was changed: + ----- Method: TextOnCurve>>extent (in category 'accessing') ----- - ----- Method: TextOnCurve>>extent (in category 'access') ----- extent ^ curve bounds extent! Item was changed: + ----- Method: TextOnCurve>>pointInLine:forDestPoint:segStart:segAngle: (in category 'private') ----- - ----- Method: TextOnCurve>>pointInLine:forDestPoint:segStart:segAngle: (in category 'as yet unclassified') ----- pointInLine: line forDestPoint: p segStart: segStart segAngle: segAngle ^ (p rotateBy: segAngle about: segStart) translateBy: (0@(line baseline + container baseline)) - segStart! Item was changed: + ----- Method: TextOnCurve>>releaseCachedState (in category 'caching') ----- - ----- Method: TextOnCurve>>releaseCachedState (in category 'as yet unclassified') ----- releaseCachedState super releaseCachedState. CachedWarpMap := CachedWarpDepth := CachedWarpColor := nil! Item was changed: + ----- Method: TextOnCurve>>textOwner: (in category 'accessing') ----- - ----- Method: TextOnCurve>>textOwner: (in category 'access') ----- textOwner: theCurve curve := theCurve! Item was changed: + ----- Method: TextOnCurve>>textSegmentsDo: (in category 'private') ----- - ----- Method: TextOnCurve>>textSegmentsDo: (in category 'as yet unclassified') ----- textSegmentsDo: blockForLineDestPivotAngle | segments segSpec | (segments := container textSegments) ifNil: [^self]. 1 to: lines size do: [:i | segSpec := segments at: i. blockForLineDestPivotAngle value: (lines at: i) value: (segSpec first) value: (segSpec second) value: (segSpec third)]! Item was changed: + ----- Method: TextOnCurve>>warpMapForDepth:withTransparentFor: (in category 'private') ----- - ----- Method: TextOnCurve>>warpMapForDepth:withTransparentFor: (in category 'as yet unclassified') ----- warpMapForDepth: destDepth withTransparentFor: bkgndColor (CachedWarpDepth = destDepth and: [CachedWarpColor = bkgndColor]) ifTrue: ["Map is OK as is -- return it" ^CachedWarpMap]. (CachedWarpMap isNil or: [CachedWarpDepth ~= destDepth]) ifTrue: ["Have to recreate the map" CachedWarpMap := Color computeColormapFrom: 32 to: destDepth. CachedWarpDepth := destDepth] ifFalse: ["Map is OK, if we restore prior color substiution" CachedWarpMap at: (CachedWarpColor indexInMap: CachedWarpMap) put: (CachedWarpColor pixelValueForDepth: destDepth)]. "Now map the background color into transparent, and return the new map" CachedWarpColor := bkgndColor. CachedWarpMap at: (CachedWarpColor indexInMap: CachedWarpMap) put: 0. ^CachedWarpMap! Item was changed: + ----- Method: TextOnCurveContainer>>baseline (in category 'accessing') ----- - ----- Method: TextOnCurveContainer>>baseline (in category 'as yet unclassified') ----- baseline baseline ifNil: [^ 0]. ^ baseline! Item was changed: + ----- Method: TextOnCurveContainer>>baseline: (in category 'accessing') ----- - ----- Method: TextOnCurveContainer>>baseline: (in category 'as yet unclassified') ----- baseline: newBaseline baseline := newBaseline! Item was changed: + ----- Method: TextOnCurveContainer>>bounds (in category 'accessing') ----- - ----- Method: TextOnCurveContainer>>bounds (in category 'as yet unclassified') ----- bounds textSegments ifNil: [^nil]. ^textSegments inject: (textSegments first first) into: [:bnd :each | bnd merge: (each first)]! Item was changed: + ----- Method: TextOnCurveContainer>>paragraphClass (in category 'accessing') ----- - ----- Method: TextOnCurveContainer>>paragraphClass (in category 'as yet unclassified') ----- paragraphClass ^ TextOnCurve! Item was changed: + ----- Method: TextOnCurveContainer>>releaseCachedState (in category 'caching') ----- - ----- Method: TextOnCurveContainer>>releaseCachedState (in category 'as yet unclassified') ----- releaseCachedState textSegments := nil.! Item was changed: + ----- Method: TextOnCurveContainer>>textDirection (in category 'accessing') ----- - ----- Method: TextOnCurveContainer>>textDirection (in category 'as yet unclassified') ----- textDirection ^ textDirection! Item was changed: + ----- Method: TextOnCurveContainer>>textDirection: (in category 'accessing') ----- - ----- Method: TextOnCurveContainer>>textDirection: (in category 'as yet unclassified') ----- textDirection: plusOrMinusOne textDirection := plusOrMinusOne! Item was changed: + ----- Method: TextOnCurveContainer>>textSegments (in category 'accessing') ----- - ----- Method: TextOnCurveContainer>>textSegments (in category 'as yet unclassified') ----- textSegments ^ textSegments! Item was changed: + ----- Method: TextOnCurveContainer>>textSegments: (in category 'accessing') ----- - ----- Method: TextOnCurveContainer>>textSegments: (in category 'as yet unclassified') ----- textSegments: segments textSegments := segments! Item was changed: + ----- Method: TextOnCurveContainer>>top (in category 'accessing') ----- - ----- Method: TextOnCurveContainer>>top (in category 'as yet unclassified') ----- top ^ 1 "for compatibility"! Item was changed: + ----- Method: TextOnCurveContainer>>translateBy: (in category 'transforming') ----- - ----- Method: TextOnCurveContainer>>translateBy: (in category 'as yet unclassified') ----- translateBy: delta textSegments isNil ifTrue: [^self]. textSegments := textSegments collect: [:ls | Array with: (ls first translateBy: delta) with: (ls second translateBy: delta) with: ls third]! Item was changed: + ----- Method: TransformationB2Morph>>useRegularWarpBlt: (in category 'accessing') ----- - ----- Method: TransformationB2Morph>>useRegularWarpBlt: (in category 'as yet unclassified') ----- useRegularWarpBlt: aBoolean useRegularWarpBlt := aBoolean! Item was changed: + ----- Method: ZASMStepsMorph>>getStepCount (in category 'accessing') ----- - ----- Method: ZASMStepsMorph>>getStepCount (in category 'as yet unclassified') ----- getStepCount ^[self contents asNumber] ifError: [ :a :b | 10] ! Item was changed: + ----- Method: ZASMStepsMorph>>setStepCount: (in category 'accessing') ----- - ----- Method: ZASMStepsMorph>>setStepCount: (in category 'as yet unclassified') ----- setStepCount: n self contents: n printString. !

1 0

The Trunk: Graphics-nice.374.mcz
by commits＠source.squeak.org 26 Apr '17

26 Apr '17

Nicolas Cellier uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-nice.374.mcz ==================== Summary ==================== Name: Graphics-nice.374 Author: nice Time: 26 April 2017, 11:03:04.6544 pm UUID: 7b1aeafa-4b31-4143-9add-cba95d9617f1 Ancestors: Graphics-ul.373 Classify a few 'as yet unclassified' methods =============== Diff against Graphics-ul.373 =============== Item was changed: + ----- Method: Color>>alpha (in category 'accessing') ----- - ----- Method: Color>>alpha (in category 'access') ----- alpha "Return the opacity ('alpha') value of opaque so that normal colors can be compared to TransparentColors." ^ 1.0 ! Item was changed: + ----- Method: Color>>blue (in category 'accessing') ----- - ----- Method: Color>>blue (in category 'access') ----- blue "Return the blue component of this color, a float in the range [0.0..1.0]." ^ self privateBlue asFloat / ComponentMax! Item was changed: + ----- Method: Color>>brightness (in category 'accessing') ----- - ----- Method: Color>>brightness (in category 'access') ----- brightness "Return the brightness of this color, a float in the range [0.0..1.0]." ^ ((self privateRed max: self privateGreen) max: self privateBlue) asFloat / ComponentMax! Item was changed: + ----- Method: Color>>green (in category 'accessing') ----- - ----- Method: Color>>green (in category 'access') ----- green "Return the green component of this color, a float in the range [0.0..1.0]." ^ self privateGreen asFloat / ComponentMax! Item was changed: + ----- Method: Color>>hue (in category 'accessing') ----- - ----- Method: Color>>hue (in category 'access') ----- hue "Return the hue of this color, an angle in the range [0.0..360.0]." | r g b max min span h | r := self privateRed. g := self privateGreen. b := self privateBlue. max := ((r max: g) max: b). min := ((r min: g) min: b). span := (max - min) asFloat. span = 0.0 ifTrue: [ ^ 0.0 ]. r = max ifTrue: [ h := ((g - b) asFloat / span) * 60.0. ] ifFalse: [ g = max ifTrue: [ h := 120.0 + (((b - r) asFloat / span) * 60.0). ] ifFalse: [ h := 240.0 + (((r - g) asFloat / span) * 60.0). ]. ]. h < 0.0 ifTrue: [ h := 360.0 + h ]. ^ h! Item was changed: + ----- Method: Color>>luminance (in category 'accessing') ----- - ----- Method: Color>>luminance (in category 'access') ----- luminance "Return the luminance of this color, a brightness value weighted by the human eye's color sensitivity." ^ ((299 * self privateRed) + (587 * self privateGreen) + (114 * self privateBlue)) / (1000 * ComponentMax) ! Item was changed: + ----- Method: Color>>red (in category 'accessing') ----- - ----- Method: Color>>red (in category 'access') ----- red "Return the red component of this color, a float in the range [0.0..1.0]." ^ self privateRed asFloat / ComponentMax! Item was changed: + ----- Method: Color>>saturation (in category 'accessing') ----- - ----- Method: Color>>saturation (in category 'access') ----- saturation "Return the saturation of this color, a value between 0.0 and 1.0." | r g b max min | r := self privateRed. g := self privateGreen. b := self privateBlue. max := min := r. g > max ifTrue: [max := g]. b > max ifTrue: [max := b]. g < min ifTrue: [min := g]. b < min ifTrue: [min := b]. max = 0 ifTrue: [ ^ 0.0 ] ifFalse: [ ^ (max - min) asFloat / max asFloat ]. ! Item was changed: + ----- Method: FormSetFont>>displayString:on:from:to:at:kern: (in category 'displaying') ----- - ----- Method: FormSetFont>>displayString:on:from:to:at:kern: (in category 'as yet unclassified') ----- displayString: aString on: aBitBlt from: startIndex to: stopIndex at: aPoint kern: kernDelta "Draw the given string from startIndex to stopIndex " combinationRule ifNotNil: [:r | aBitBlt combinationRule: r]. tintable == false ifTrue: [aBitBlt colorMap: nil]. ^ super displayString: aString on: aBitBlt from: startIndex to: stopIndex at: aPoint kern: kernDelta! Item was changed: + ----- Method: FormSetFont>>fromFormArray:asciiStart:ascent: (in category 'initialize-release') ----- - ----- Method: FormSetFont>>fromFormArray:asciiStart:ascent: (in category 'as yet unclassified') ----- fromFormArray: formArray asciiStart: asciiStart ascent: ascentVal | height width x badChar | type := 2. name := 'aFormFont'. minAscii := asciiStart. maxAscii := minAscii + formArray size - 1. ascent := ascentVal. subscript := superscript := emphasis := 0. height := width := 0. maxWidth := 0. formArray do: [:f | width := width + f width. maxWidth := maxWidth max: f width. height := height max: f height + f offset y]. badChar := (Form extent: 7@height) borderWidth: 1. width := width + badChar width. descent := height - ascent. pointSize := height. glyphs := Form extent: width @ height depth: formArray first depth. xTable := Array new: maxAscii + 3 withAll: 0. x := 0. formArray doWithIndex: [:f :i | f displayOn: glyphs at: x@0. xTable at: minAscii + i+1 put: (x := x + f width)]. badChar displayOn: glyphs at: x@0. xTable at: maxAscii + 3 put: x + badChar width. characterToGlyphMap := nil.! Item was changed: + ----- Method: FormSetFont>>initialize (in category 'initialize-release') ----- - ----- Method: FormSetFont>>initialize (in category 'as yet unclassified') ----- initialize super initialize. self preserveColors.! Item was changed: + ----- Method: FormSetFont>>reset (in category 'emphasis') ----- - ----- Method: FormSetFont>>reset (in category 'as yet unclassified') ----- reset "Ignored by FormSetFonts"! Item was changed: + ----- Method: IdentityGlyphMap>>at: (in category 'accessing') ----- - ----- Method: IdentityGlyphMap>>at: (in category 'as yet unclassified') ----- at: index ^ index - 1. ! Item was changed: + ----- Method: InfiniteForm>>addFillStyleMenuItems:hand:from: (in category 'Morphic menu') ----- - ----- Method: InfiniteForm>>addFillStyleMenuItems:hand:from: (in category 'as yet unclassified') ----- addFillStyleMenuItems: aMenu hand: aHand from: aMorph "Add the items for changing the current fill style of the receiver" "prevents a walkback when control menu is built for morph with me as color"! Item was changed: + ----- Method: StaticForm>>isStatic (in category 'testing') ----- - ----- Method: StaticForm>>isStatic (in category 'as yet unclassified') ----- isStatic ^true! Item was changed: + ----- Method: TextComposer>>addNullLineForIndex: (in category 'private') ----- - ----- Method: TextComposer>>addNullLineForIndex: (in category 'as yet unclassified') ----- addNullLineForIndex: index "This awful bit is to ensure that if we have scanned all the text and the last character is a CR that there is a null line at the end of lines. Sometimes this was not happening which caused anomalous selections when selecting all the text. This is implemented as a post-composition fixup because I couldn't figure out where to put it in the main logic." | oldLastLine r | oldLastLine := lines last. oldLastLine last - oldLastLine first >= 0 ifFalse: [^self]. oldLastLine last = (index - 1) ifFalse: [^self]. r := oldLastLine left @ oldLastLine bottom extent: 0@(oldLastLine bottom - oldLastLine top). "Even though we may be below the bottom of the container, it is still necessary to compose the last line for consistency..." self addNullLineWithIndex: index andRectangle: r. ! Item was changed: + ----- Method: TextComposer>>addNullLineWithIndex:andRectangle: (in category 'private') ----- - ----- Method: TextComposer>>addNullLineWithIndex:andRectangle: (in category 'as yet unclassified') ----- addNullLineWithIndex: index andRectangle: r lines addLast: ( ( TextLine start: index stop: index - 1 internalSpaces: 0 paddingWidth: 0 ) rectangle: r; lineHeight: defaultLineHeight baseline: theTextStyle baseline ) ! Item was changed: + ----- Method: TextComposer>>checkIfReadyToSlide (in category 'private') ----- - ----- Method: TextComposer>>checkIfReadyToSlide (in category 'as yet unclassified') ----- checkIfReadyToSlide "Check whether we are now in sync with previously composed lines" (possibleSlide and: [currCharIndex > stopCharIndex]) ifFalse: [^self]. [prevIndex < prevLines size and: [(prevLines at: prevIndex) first < (currCharIndex - deltaCharIndex)]] whileTrue: [prevIndex := prevIndex + 1]. (prevLines at: prevIndex) first = (currCharIndex - deltaCharIndex) ifTrue: [ "Yes -- next line will have same start as prior line." prevIndex := prevIndex - 1. possibleSlide := false. nowSliding := true ] ifFalse: [ prevIndex = prevLines size ifTrue: [ "Weve reached the end of prevLines, so no use to keep looking for lines to slide." possibleSlide := false ] ]! Item was changed: + ----- Method: TextComposer>>composeAllLines (in category 'private') ----- - ----- Method: TextComposer>>composeAllLines (in category 'as yet unclassified') ----- composeAllLines [currCharIndex <= theText size and: [(currentY + defaultLineHeight) <= theContainer bottom]] whileTrue: [ nowSliding ifTrue: [ self slideOneLineDown ifNil: [^nil]. ] ifFalse: [ self composeOneLine ifNil: [^nil]. ] ]. ! Item was changed: + ----- Method: TextComposer>>composeAllRectangles: (in category 'private') ----- - ----- Method: TextComposer>>composeAllRectangles: (in category 'as yet unclassified') ----- composeAllRectangles: rectangles | charIndexBeforeLine numberOfLinesBefore reasonForStopping | actualHeight := defaultLineHeight. charIndexBeforeLine := currCharIndex. numberOfLinesBefore := lines size. reasonForStopping := self composeEachRectangleIn: rectangles. currentY := currentY + actualHeight. currentY > theContainer bottom ifTrue: [ "Oops -- the line is really too high to fit -- back out" currCharIndex := charIndexBeforeLine. lines size - numberOfLinesBefore timesRepeat: [lines removeLast]. ^self ]. "It's OK -- the line still fits." maxRightX := maxRightX max: scanner rightX. 1 to: rectangles size - 1 do: [ :i | |lineIndex| "Adjust heights across rectangles if necessary" lineIndex:=lines size - rectangles size + i. (lines size between: 1 and: lineIndex) ifTrue: [(lines at: lineIndex) lineHeight: lines last lineHeight baseline: lines last baseline] ]. isFirstLine := false. reasonForStopping == #columnBreak ifTrue: [^nil]. currCharIndex > theText size ifTrue: [ ^nil "we are finished composing" ]. ! Item was changed: + ----- Method: TextComposer>>composeEachRectangleIn: (in category 'private') ----- - ----- Method: TextComposer>>composeEachRectangleIn: (in category 'as yet unclassified') ----- composeEachRectangleIn: rectangles | myLine lastChar | 1 to: rectangles size do: [:i | currCharIndex <= theText size ifFalse: [^false]. myLine := scanner composeFrom: currCharIndex inRectangle: (rectangles at: i) firstLine: isFirstLine leftSide: i=1 rightSide: i=rectangles size. lines addLast: myLine. actualHeight := actualHeight max: myLine lineHeight. "includes font changes" currCharIndex := myLine last + 1. lastChar := theText at: myLine last. (CharacterSet crlf includes: lastChar) ifTrue: [^#cr]. wantsColumnBreaks ifTrue: [ lastChar = Character characterForColumnBreak ifTrue: [^#columnBreak]. ]. ]. ^false! Item was changed: + ----- Method: TextComposer>>composeLinesFrom:to:delta:into:priorLines:atY:textStyle:text:container:wantsColumnBreaks: (in category 'composing') ----- - ----- Method: TextComposer>>composeLinesFrom:to:delta:into:priorLines:atY:textStyle:text:container:wantsColumnBreaks: (in category 'as yet unclassified') ----- composeLinesFrom: argStart to: argStop delta: argDelta into: argLinesCollection priorLines: argPriorLines atY: argStartY textStyle: argTextStyle text: argText container: argContainer wantsColumnBreaks: argWantsColumnBreaks wantsColumnBreaks := argWantsColumnBreaks. lines := argLinesCollection. theTextStyle := argTextStyle. theText := argText. theContainer := argContainer. deltaCharIndex := argDelta. currCharIndex := startCharIndex := argStart. stopCharIndex := argStop. prevLines := argPriorLines. currentY := argStartY. maxRightX := theContainer left. possibleSlide := stopCharIndex < theText size and: [theContainer isMemberOf: Rectangle]. nowSliding := false. prevIndex := 1. "choose an appropriate scanner - should go away soon, when they can be unified" scanner := CompositionScanner new. scanner text: theText textStyle: theTextStyle. scanner wantsColumnBreaks: wantsColumnBreaks. defaultLineHeight := scanner computeDefaultLineHeight. isFirstLine := true. self composeAllLines. isFirstLine ifTrue: ["No space in container or empty text" self addNullLineWithIndex: startCharIndex andRectangle: (theContainer left @ theContainer top extent: 0@defaultLineHeight) ] ifFalse: [ (lines last last = theText size and: [scanner doesTheLineBreaksAfterLastChar]) ifTrue: [self addNullLineForIndex: theText size + 1] ]. ^{lines asArray. maxRightX} ! Item was changed: + ----- Method: TextComposer>>composeOneLine (in category 'private') ----- - ----- Method: TextComposer>>composeOneLine (in category 'as yet unclassified') ----- composeOneLine | rectangles | rectangles := theContainer rectanglesAt: currentY height: defaultLineHeight. rectangles notEmpty ifTrue: [(self composeAllRectangles: rectangles) ifNil: [^nil]] ifFalse: [currentY := currentY + defaultLineHeight]. self checkIfReadyToSlide! Item was changed: + ----- Method: TextComposer>>slideOneLineDown (in category 'private') ----- - ----- Method: TextComposer>>slideOneLineDown (in category 'as yet unclassified') ----- slideOneLineDown | priorLine | "Having detected the end of rippling recoposition, we are only sliding old lines" prevIndex < prevLines size ifFalse: [ "There are no more prevLines to slide." ^nowSliding := possibleSlide := false ]. "Adjust and re-use previously composed line" prevIndex := prevIndex + 1. priorLine := (prevLines at: prevIndex) slideIndexBy: deltaCharIndex andMoveTopTo: currentY. lines addLast: priorLine. currentY := priorLine bottom. currCharIndex := priorLine last + 1. wantsColumnBreaks ifTrue: [ priorLine first to: priorLine last do: [ :i | (theText at: i) = Character characterForColumnBreak ifTrue: [ nowSliding := possibleSlide := false. ^nil ]. ]. ]. !

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages April 2017