Squeak-dev December 2017

squeak-dev@lists.squeakfoundation.org

34 participants
159 discussions

The Trunk: System-mt.990.mcz
by commits＠source.squeak.org 21 Dec '17

21 Dec '17

Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.990.mcz ==================== Summary ==================== Name: System-mt.990 Author: mt Time: 21 December 2017, 9:36:40.491231 am UUID: 3ee22422-e98a-d74b-a567-e1797e988900 Ancestors: System-dtl.989 Provide UI theme specs for drag-transfer-morphs derived from balloon morphs. =============== Diff against System-dtl.989 =============== Item was changed: ----- Method: SqueakTheme class>>addDialogs: (in category 'instance creation') ----- addDialogs: theme "self create apply." theme set: #borderColor for: #DialogWindow to: Color gray; set: #borderWidth for: #DialogWindow to: 1; set: #borderStyle for: #DialogWindow to: BorderStyle default; set: #color for: #DialogWindow to: Color white; set: #titleBorderColor for: #DialogWindow to: Color gray; set: #titleBorderWidth for: #DialogWindow to: 0; set: #titleBorderStyle for: #DialogWindow to: BorderStyle default; set: #titleColor for: #DialogWindow to: (Color r: 0.658 g: 0.678 b: 0.78); set: #titleFont for: #DialogWindow to: [Preferences windowTitleFont]; set: #titleTextColor for: #DialogWindow to: Color black; set: #font for: #DialogWindow to: [Preferences standardSystemFont]; set: #textColor for: #DialogWindow to: Color black; set: #okColor for: #DialogWindow to: (Color r: 0.49 g: 0.749 b: 0.49); set: #cancelColor for: #DialogWindow to: (Color r: 1 g: 0.6 b: 0.588); set: #buttonColor for: #DialogWindow to: (Color r: 0.658 g: 0.678 b: 0.78) twiceLighter; set: #selectionModifier for: #DialogWindow to: [ [:c | Color orange muchLighter ] ]. "The List Chooser is a dialog, too." theme derive: #okColor for: #ListChooser from: #DialogWindow; derive: #cancelColor for: #ListChooser from: #DialogWindow; set: #addColor for: #ListChooser to: Color blue muchLighter; set: #disabledColor for: #ListChooser to: Color gray. "And the mulitple list chooser." theme derive: #okColor for: #ListMultipleChooser from: #DialogWindow; derive: #cancelColor for: #ListMultipleChooser from: #DialogWindow. "And the system progress bar." theme derive: #borderColor for: #SystemProgressMorph from: #MenuMorph; derive: #borderWidth for: #SystemProgressMorph from: #MenuMorph; derive: #borderStyle for: #SystemProgressMorph from: #MenuMorph; derive: #color for: #SystemProgressMorph from: #MenuMorph; derive: #font for: #SystemProgressMorph from: #MenuItemMorph; derive: #textColor for: #SystemProgressMorph from: #MenuItemMorph; set: #borderColor for: #SystemProgressBarMorph to: Color transparent; set: #borderWidth for: #SystemProgressBarMorph to: 0; set: #borderStyle for: #SystemProgressBarMorph to: BorderStyle default; set: #color for: #SystemProgressBarMorph to: (Color r: 0.977 g: 0.977 b: 0.977); set: #barColor for: #SystemProgressBarMorph to: (Color r: 0.72 g: 0.72 b: 0.9). "And the balloon morphs." theme set: #borderColor for: #NewBalloonMorph to: (Color r: 0.46 g: 0.46 b: 0.353); set: #borderWidth for: #NewBalloonMorph to: 1; set: #color for: #NewBalloonMorph to:(Color r: 0.92 g: 0.92 b: 0.706); set: #font for: #NewBalloonMorph to: [Preferences standardBalloonHelpFont]; derive: #textColor for: #NewBalloonMorph from: #PluggableButtonMorph. theme derive: #borderColor for: #BalloonMorph from: #NewBalloonMorph; set: #borderWidth for: #BalloonMorph to: 0; derive: #color for: #BalloonMorph from: #NewBalloonMorph; derive: #font for: #BalloonMorph from: #NewBalloonMorph; + derive: #textColor for: #BalloonMorph from: #NewBalloonMorph. + + "And the transfer morphs." + theme + derive: #borderColor for: #TransferMorph from: #NewBalloonMorph; + derive: #borderWidth for: #TransferMorph from: #NewBalloonMorph; + derive: #color for: #TransferMorph from: #NewBalloonMorph; + derive: #font for: #TransferMorph from: #NewBalloonMorph; + derive: #textColor for: #TransferMorph from: #NewBalloonMorph. ! - derive: #textColor for: #BalloonMorph from: #NewBalloonMorph.!

1 0

The Trunk: Morphic-mt.1380.mcz
by commits＠source.squeak.org 21 Dec '17

21 Dec '17

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1380.mcz ==================== Summary ==================== Name: Morphic-mt.1380 Author: mt Time: 21 December 2017, 9:05:08.079231 am UUID: a78fcc1d-dbf1-0c49-a445-df9f4834bbaf Ancestors: Morphic-mt.1379 Removes the hack used for text dropping. Not necessary anymore due to the latest fix in PluggableTextMorphPlus. =============== Diff against Morphic-mt.1379 =============== Item was changed: ----- Method: TextMorphForEditView>>acceptDroppingMorph:event: (in category 'dropping/grabbing') ----- acceptDroppingMorph: aTransferMorph event: evt "Accept a text to be inserted at the event/cursor position. Either remove or keep the source text depending on the transfer morph's copy state." self removeProperty: #waitingForTextDrag. self handleInteraction: [ aTransferMorph shouldCopy ifFalse: [(aTransferMorph source respondsTo: #editor) ifTrue: [aTransferMorph source editor destructiveBackWord]]. self editor addText: aTransferMorph passenger asText event: evt] fromEvent: evt. + + evt hand newKeyboardFocus: self.! - - self flag: #hack. "mt: Shout background styling restores the selection, which interferes here. *sigh*" - self editView instVarNamed: #selectionInterval put: nil. - (aTransferMorph source respondsTo: #editView) - ifTrue: [aTransferMorph source editView instVarNamed: #selectionInterval put: nil.]!

1 0

The Trunk: ToolBuilder-Morphic-mt.204.mcz
by commits＠source.squeak.org 21 Dec '17

21 Dec '17

Marcel Taeumel uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-mt.204.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-mt.204 Author: mt Time: 21 December 2017, 9:03:48.515231 am UUID: 0832e3f9-24fa-e347-b69e-9835e3ba58b4 Ancestors: ToolBuilder-Morphic-mt.203 Clean-up in Shout styling callback. 1) Use the correct way to recompute the selection. 2) Update comments. =============== Diff against ToolBuilder-Morphic-mt.203 =============== Item was changed: ----- Method: PluggableTextMorphPlus>>stylerStyled: (in category 'styling') ----- stylerStyled: styledCopyOfText + "Sent after the styler completed styling the underlying text. The behavior is similar to #handleInteraction:event: but we do not have to copy text ore make those other checks." + - "Sent after the styler completed styling the underlying text" textMorph contents runs: styledCopyOfText runs . + - "textMorph paragraph recomposeFrom: 1 to: textMorph contents size delta: 0." "caused chars to appear in wrong order esp. in demo mode. remove this line when sure it is fixed" textMorph paragraph composeAll. + textMorph editor recomputeSelection. textMorph updateFromParagraph. + - selectionInterval - ifNotNil:[ - textMorph editor - selectInvisiblyFrom: selectionInterval first to: selectionInterval last; - storeSelectionInParagraph; - setEmphasisHere]. textMorph editor blinkParen. + self scrollSelectionIntoView.! - self scrollSelectionIntoView!

1 0

Maybe we should apply?
by Tobias Pape 21 Dec '17

21 Dec '17

https://pineapplefund.org/ ? -t

1 0

The Trunk: Morphic-mt.1379.mcz
by commits＠source.squeak.org 21 Dec '17

21 Dec '17

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1379.mcz ==================== Summary ==================== Name: Morphic-mt.1379 Author: mt Time: 21 December 2017, 8:33:23.144231 am UUID: c8b04fdb-0e87-5340-88ff-09752f146b68 Ancestors: Morphic-mt.1378 Fixes a regression from Squeak 4.6. Opening parens blink again even if auto-enclose is not enabled. =============== Diff against Morphic-mt.1378 =============== Item was changed: ----- Method: TextEditor>>dispatchOnKeyboardEvent: (in category 'typing support') ----- dispatchOnKeyboardEvent: aKeyboardEvent "Carry out the action associated with this character, if any. Type-ahead is passed so some routines can flush or use it." | honorCommandKeys typedChar | typedChar := aKeyboardEvent keyCharacter. "Handle one-line input fields." (typedChar == Character cr and: [morph acceptOnCR]) ifTrue: [^ true]. "Clear highlight for last opened parenthesis." self clearParens. "Handle line breaks and auto indent." typedChar == Character cr ifTrue: [ aKeyboardEvent controlKeyPressed ifTrue: [^ self normalCharacter: aKeyboardEvent]. aKeyboardEvent shiftPressed ifTrue: [^ self lf: aKeyboardEvent]. aKeyboardEvent commandKeyPressed ifTrue: [^ self crlf: aKeyboardEvent]. ^ self crWithIndent: aKeyboardEvent]. "Handle indent/outdent with selected text block." typedChar == Character tab ifTrue: [ aKeyboardEvent shiftPressed ifTrue: [self outdent: aKeyboardEvent. ^ true] ifFalse: [self hasMultipleLinesSelected ifTrue: [self indent: aKeyboardEvent. ^ true]]]. honorCommandKeys := Preferences cmdKeysInText. (honorCommandKeys and: [typedChar == Character enter]) ifTrue: [^ self dispatchOnEnterWith: aKeyboardEvent]. "Special keys overwrite crtl+key combinations - at least on Windows. To resolve this conflict, assume that keys other than cursor keys aren't used together with Crtl." ((self class specialShiftCmdKeys includes: aKeyboardEvent keyValue) and: [aKeyboardEvent keyValue < 27]) ifTrue: [^ aKeyboardEvent controlKeyPressed ifTrue: [self perform: (self class shiftCmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent] ifFalse: [self perform: (self class cmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent]]. "backspace, and escape keys (ascii 8 and 27) are command keys" ((honorCommandKeys and: [aKeyboardEvent commandKeyPressed]) or: [self class specialShiftCmdKeys includes: aKeyboardEvent keyValue]) ifTrue: [ ^ aKeyboardEvent shiftPressed ifTrue: [self perform: (self class shiftCmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent] ifFalse: [self perform: (self class cmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent]]. "the control key can be used to invoke shift-cmd shortcuts" (honorCommandKeys and: [ aKeyboardEvent controlKeyPressed ]) ifTrue: [^ self perform: (self class shiftCmdActions at: aKeyboardEvent keyValue + 1) with: aKeyboardEvent]. "Enclose selection with brackets etc." ((self class encloseSelection and: [self hasSelection]) and: [self enclose: aKeyboardEvent]) ifTrue: [^ true]. "Automatically enclose paired characters such as brackets." (self class autoEnclose and: [self autoEncloseFor: typedChar]) ifTrue: [^ true]. + + "Even if no enclosing feature was used, highlight the matching bracket when closing one." + (')]}' includes: typedChar) + ifTrue: [self blinkPrevParen: typedChar]. self normalCharacter: aKeyboardEvent. ^ false!

1 0

The Trunk: Tools-tpr.780.mcz
by commits＠source.squeak.org 20 Dec '17

20 Dec '17

tim Rowledge uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-tpr.780.mcz ==================== Summary ==================== Name: Tools-tpr.780 Author: tpr Time: 20 December 2017, 11:47:36.353661 am UUID: ff0363cd-738f-4147-bd36-ea2a42f23ffc Ancestors: Tools-mt.779 Small improvement to the spawnToClass: related browser buiding - gets the initial slection cleaner etc =============== Diff against Tools-mt.779 =============== Item was changed: ----- Method: Browser class>>newOnClass:messageCategory:selector:editString:label: (in category 'instance creation') ----- newOnClass: aClass messageCategory: aCategory selector: aSelector editString: aString label: aLabel "Open a new message protocol browser on this class & protocol with aString pre-selected in the code pane. We have to be a bit sneaky to do the string insertion since it cannot be handled until after the actual browser is built and opened" "Browser newOnClass: Browser messageCategory: 'controls' selector: #decorateButtons editString: 'test string edit setup' label: 'Testing class browser with set edit string'" | newBrowser| newBrowser := self new. "setting up a new browser for a specific class, category and selector requires this order of messages since the #selectMessageCategoryNamed: carefully nils the chosen selector; thus we can't use the more obvious seeming #setClass:selector: method" newBrowser setClass: aClass; selectMessageCategoryNamed: aCategory; + selectMessageNamed: aSelector; + editSelection: #editMessage. - selectMessageNamed: aSelector. newBrowser buildAndOpenMessageCategoryBrowserLabel: 'Message Category Browser (' , aClass name, ')'. aString ifNotNil:[newBrowser changed: #editString with: aString]. ^newBrowser! Item was changed: ----- Method: CodeHolder>>buildMessageCategoryBrowserForCategory:class:selector:editString: (in category 'construction') ----- buildMessageCategoryBrowserForCategory: aCategory class: aClass selector: aSelectorOrNil editString: methodSourceCode "Create and schedule a new class browser for the current selection, with initial textual contents set to aString. This is used specifically in spawning where a class is established but a method-category is not." self flag: #uglyHack. "mt: We should not abuse Browser like this. We should not even know about #Browser in this superclass." ^ (Browser newOnClass: aClass messageCategory: aCategory selector: aSelectorOrNil editString: methodSourceCode + label: 'Message category Browser: ' , aClass name , aCategory)! - label: 'Message category Browser: ' , aClass name , aCategory) - editSelection: #editMessage; "...because we know it is method code." - changed: #editString with: methodSourceCode; "...trigger re-styling." - yourself!

1 0

The Trunk: Tools-mt.779.mcz
by commits＠source.squeak.org 20 Dec '17

20 Dec '17

Marcel Taeumel uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-mt.779.mcz ==================== Summary ==================== Name: Tools-mt.779 Author: mt Time: 19 December 2017, 8:39:28.282281 am UUID: 5e2d8ff5-fe52-c743-931e-637a058fcbd8 Ancestors: Tools-eem.778 Fixes the behavior of "browser spawning" (via CMD+O), which affects "copy up or down..." of methods in the class tree. Note that the rather new interface for building browsers via #newOnClass... introduced a serious deception in terms of which kind of browser (full, class, protocol) is being build. We have to make this more clear! =============== Diff against Tools-eem.778 =============== Item was changed: ----- Method: Browser class>>newOnClass:messageCategory:selector:editString:label: (in category 'instance creation') ----- newOnClass: aClass messageCategory: aCategory selector: aSelector editString: aString label: aLabel "Open a new message protocol browser on this class & protocol with aString pre-selected in the code pane. We have to be a bit sneaky to do the string insertion since it cannot be handled until after the actual browser is built and opened" "Browser newOnClass: Browser messageCategory: 'controls' selector: #decorateButtons editString: 'test string edit setup' label: 'Testing class browser with set edit string'" | newBrowser| newBrowser := self new. "setting up a new browser for a specific class, category and selector requires this order of messages since the #selectMessageCategoryNamed: carefully nils the chosen selector; thus we can't use the more obvious seeming #setClass:selector: method" + newBrowser + setClass: aClass; + selectMessageCategoryNamed: aCategory; - newBrowser setClass: aClass; - selectMessageCategoryNamed: aCategory; selectMessageNamed: aSelector. newBrowser buildAndOpenMessageCategoryBrowserLabel: 'Message Category Browser (' , aClass name, ')'. aString ifNotNil:[newBrowser changed: #editString with: aString]. ^newBrowser! Item was changed: ----- Method: CodeHolder>>buildClassBrowserEditString: (in category 'construction') ----- + buildClassBrowserEditString: classDefinition - buildClassBrowserEditString: aString "Create and schedule a new class browser for the current selection, with initial textual contents set to aString. This is used specifically in spawning where a class is established but a method-category is not." + self flag: #uglyHack. "mt: We should not abuse Browser like this. We should not even know about #Browser in this superclass." + ^(Browser + newOnClass: self selectedClassOrMetaClass + editString: classDefinition + label: 'Class Browser: ', self selectedClassOrMetaClass name) + editSelection: #editClass; "...because we know it is class def code." + changed: #editString with: classDefinition; "...trigger re-styling." + yourself - ^Browser newOnClass: self selectedClassOrMetaClass editString: aString label: 'Class Browser: ', self selectedClassOrMetaClass name ! Item was added: + ----- Method: CodeHolder>>buildMessageCategoryBrowserForCategory:class:selector:editString: (in category 'construction') ----- + buildMessageCategoryBrowserForCategory: aCategory class: aClass selector: aSelectorOrNil editString: methodSourceCode + "Create and schedule a new class browser for the current selection, + with initial textual contents set to aString. This is used specifically in + spawning where a class is established but a method-category is not." + + self flag: #uglyHack. "mt: We should not abuse Browser like this. We should not even know about #Browser in this superclass." + ^ (Browser + newOnClass: aClass + messageCategory: aCategory + selector: aSelectorOrNil + editString: methodSourceCode + label: 'Message category Browser: ' , aClass name , aCategory) + editSelection: #editMessage; "...because we know it is method code." + changed: #editString with: methodSourceCode; "...trigger re-styling." + yourself! Item was removed: - ----- Method: CodeHolder>>buildMessageCategoryBrowserForClass:selector:editString: (in category 'construction') ----- - buildMessageCategoryBrowserForClass: aClass selector: aSelectorOrNil editString: aString - "Create and schedule a new class browser for the current selection, - with initial textual contents set to aString. This is used specifically in - spawning where a class is established but a method-category is not." - ^ Browser - newOnClass: aClass - messageCategory: self categoryOfCurrentMethod - selector: aSelectorOrNil - editString: aString - label: 'Message category Browser: ' , self selectedClassOrMetaClass name , self categoryOfCurrentMethod! Item was changed: ----- Method: CodeHolder>>spawn: (in category 'commands') ----- spawn: aString "Create and schedule a spawned message category browser for the currently selected message category. The initial text view contains the characters in aString. In the spawned browser, preselect the current selector (if any) as the going-in assumption, though upon acceptance this will often change" + self selectedClassOrMetaClass + ifNil: [ + ^ aString isEmptyOrNil ifFalse: [(Workspace new contents: aString) openLabel: 'spawned workspace']] + ifNotNil: [:cls | + self categoryOfCurrentMethod + ifNil: [ + self buildClassBrowserEditString: aString] + ifNotNil: [:category | + self + buildMessageCategoryBrowserForCategory: category + class: cls + selector: self selectedMessageName + editString: aString]]! - | aCategory aClass | - (aClass := self selectedClassOrMetaClass) isNil ifTrue: - [^ aString isEmptyOrNil ifFalse: [(Workspace new contents: aString) openLabel: 'spawned workspace']]. - - (aCategory := self categoryOfCurrentMethod) - ifNil: - [self buildClassBrowserEditString: aString] - ifNotNil: - [self buildMessageCategoryBrowserForClass: aClass selector: self selectedMessageName editString: aString ]! Item was changed: ----- Method: CodeHolder>>spawnToClass: (in category 'commands') ----- spawnToClass: aClass "Used to copy down code from a superclass to a subclass in one easy step, if you know what you're doing. Spawns a new message-category browser for the indicated class, populating it with the source code seen in the current tool." self categoryOfCurrentMethod + ifNil: [ + self buildClassBrowserEditString: self contents] + ifNotNil: [:category | + self + buildMessageCategoryBrowserForCategory: category + class: aClass + selector: nil + editString: self contents]! - ifNil: - [self buildClassBrowserEditString: self contents] - ifNotNil: - [self buildMessageCategoryBrowserForClass: aClass selector: nil editString: self contents]!

2 1

The Trunk: Morphic-mt.1378.mcz
by commits＠source.squeak.org 20 Dec '17

20 Dec '17

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1378.mcz ==================== Summary ==================== Name: Morphic-mt.1378 Author: mt Time: 20 December 2017, 4:02:40.532079 pm UUID: 94c3d2cd-41b5-9742-a30e-7281fec08fd6 Ancestors: Morphic-mt.1377 Makes use of the text cursor in text morphs. If you want, you can drap/drop text selections, too, which has to be enabled via preference "Draggable Text Selection". Fixes cursor appearance when invoking halo, too. Note that Shout was a little bit annoying here. See TextMorphForEditView >> #acceptDroppingMorph:event:. Also note that due to the role of TextEditor, dragging is prepared in TextEditor >> #mouseDown: but started in TextMorph >> #startDrag:. Finally, note that I decided to put the current (rudimentary) version of text dropping into TextMorphForEditView, which makes text-drop only work in PluggableTextMorphs (i.e. ToolBulder-tools) and not pure TextMorphs. =============== Diff against Morphic-mt.1377 =============== Item was added: + ----- Method: Editor>>destructiveBackWord (in category 'typing/selecting keys') ----- + destructiveBackWord + "If the selection is not a caret, delete it and leave it in the backspace buffer. + Else if there is typeahead, delete it. + Else, delete the word before the caret." + + | startIndex | + self hasCaret + ifTrue: "a caret, delete at least one character" + [startIndex := 1 max: self markIndex - 1. + [startIndex > 1 and: + [(self string at: startIndex - 1) tokenish]] + whileTrue: + [startIndex := startIndex - 1]] + ifFalse: "a non-caret, just delete it" + [startIndex := self markIndex]. + self backTo: startIndex. + ^ false! Item was changed: ----- Method: Editor>>destructiveBackWord: (in category 'typing/selecting keys') ----- destructiveBackWord: aKeyboardEvent + + ^ self destructiveBackWord! - "If the selection is not a caret, delete it and leave it in the backspace buffer. - Else if there is typeahead, delete it. - Else, delete the word before the caret." - - | startIndex | - self hasCaret - ifTrue: "a caret, delete at least one character" - [startIndex := 1 max: self markIndex - 1. - [startIndex > 1 and: - [(self string at: startIndex - 1) tokenish]] - whileTrue: - [startIndex := startIndex - 1]] - ifFalse: "a non-caret, just delete it" - [startIndex := self markIndex]. - self backTo: startIndex. - ^false! Item was changed: ----- Method: Morph>>invokeHaloOrMove: (in category 'meta-actions') ----- invokeHaloOrMove: anEvent "Special gestures (cmd-mouse on the Macintosh; Alt-mouse on Windows and Unix) allow a mouse-sensitive morph to be moved or bring up a halo for the morph." | h tfm doNotDrag | h := anEvent hand halo. "Prevent wrap around halo transfers originating from throwing the event back in" doNotDrag := false. h ifNotNil:[ (h innerTarget == self) ifTrue:[doNotDrag := true]. (h innerTarget hasOwner: self) ifTrue:[doNotDrag := true]. (self hasOwner: h target) ifTrue:[doNotDrag := true]]. tfm := (self transformedFrom: nil) inverseTransformation. "cmd-drag on flexed morphs works better this way" h := self addHalo: (anEvent transformedBy: tfm). h ifNil: [^ self]. doNotDrag ifTrue:[^self]. "Initiate drag transition if requested" anEvent hand waitForClicksOrDrag: h event: (anEvent transformedBy: tfm) selectors: { nil. nil. nil. #startDragTarget:. } threshold: HandMorph dragThreshold. "Pass focus explicitly here" + anEvent hand newMouseFocus: h. + "Reset temporary cursors to make available halo interaction visible." + anEvent hand showTemporaryCursor: nil.! - anEvent hand newMouseFocus: h.! Item was added: + ----- Method: Text>>asDraggableMorph (in category '*Morphic-converting') ----- + asDraggableMorph + ^ self asMorph! Item was added: + ----- Method: TextEditor>>addText:event: (in category 'editing dragdrop') ----- + addText: aText event: anEvent + "Used for dropping/inserting text." + + | index | + index := (paragraph characterBlockAtPoint: anEvent position) stringIndex. + self closeTypeIn. + + self selectInvisiblyFrom: index to: index-1. + self replaceSelectionWith: aText.! Item was added: + ----- Method: TextEditor>>click: (in category 'events') ----- + click: evt + "This is called if you click in a text selection while drag is enabled, but you did not drag. Also see #startDrag:." + + self selectAt: (paragraph characterBlockAtPoint: evt position) stringIndex.! Item was added: + ----- Method: TextEditor>>isEventInSelection: (in category 'events') ----- + isEventInSelection: evt + "Check whether the event position is within the current selection." + + | pt a b | + self hasSelection ifFalse: [^ false]. + + pt := evt position. + a := self startBlock. + b := self stopBlock. + + ^ (pt >= a topLeft and: [pt <= b bottomLeft]) "Start and stop in same line" + or: [ + a top < b top and: [ "Start and stop in different lines." + ((pt y > a bottom and: [pt y < b top]) "Fully selected lines in the middle." + or: [pt x >= a left and: [pt y between: a top and: a bottom]]) "Top tail." + or: [pt x <= b left and: [pt y between: b top and: b bottom]]]]. "Bottom tail." + + + + + ! Item was changed: ----- Method: TextEditor>>mouseDown: (in category 'events') ----- mouseDown: evt + "Either 1) handle text actions in the paragraph, 2) begin a text drag operation, or 3) modify the caret/selection." + - "An attempt to break up the old processRedButton code into threee phases" | clickPoint b | oldInterval := self selectionInterval. clickPoint := evt cursorPoint. b := paragraph characterBlockAtPoint: clickPoint. (paragraph clickAt: clickPoint for: model controller: self) ifTrue: [ markBlock := b. pointBlock := b. evt hand releaseKeyboardFocus: morph. evt hand releaseMouseFocus: morph. ^ self ]. + (morph dragEnabled and: [self isEventInSelection: evt]) ifTrue: [ + evt hand + waitForClicksOrDrag: morph + event: evt + selectors: {#click:. nil. nil. #startDrag:} + threshold: HandMorph dragThreshold. + morph setProperty: #waitingForTextDrag toValue: true. + ^ self]. + evt shiftPressed ifFalse: [ self closeTypeIn. markBlock := b. pointBlock := b ] ifTrue: [ self closeTypeIn. self mouseMove: evt ]. self storeSelectionInParagraph! Item was changed: ----- Method: TextEditor>>mouseMove: (in category 'events') ----- mouseMove: evt + "Change the selection in response to mouse-down drag. Do not change the selection if the user wants to drag the current selection." - "Change the selection in response to mouse-down drag" + (morph hasProperty: #waitingForTextDrag) ifTrue: [^ self]. pointBlock := paragraph characterBlockAtPoint: evt position. self storeSelectionInParagraph! Item was changed: ----- Method: TextEditor>>mouseUp: (in category 'events') ----- mouseUp: evt "An attempt to break up the old processRedButton code into threee phases" + + self updateCursorForEvent: evt. + morph removeProperty: #waitingForTextDrag. + oldInterval ifNil: [^ self]. "Patched during clickAt: repair" (self hasCaret and: [oldInterval = self selectionInterval]) ifTrue: [self selectWord]. self setEmphasisHere. (self isDisjointFrom: oldInterval) ifTrue: [otherInterval := oldInterval]. self storeSelectionInParagraph! Item was added: + ----- Method: TextEditor>>updateCursorForEvent: (in category 'events') ----- + updateCursorForEvent: evt + + (((morph bounds containsPoint: evt position) + and: [morph dragEnabled not or: [(self isEventInSelection: evt) not]]) + and: [evt hand temporaryCursor ~~ Cursor text]) + ifTrue: [evt hand showTemporaryCursor: Cursor text] + ifFalse: [evt hand showTemporaryCursor: nil].! Item was added: + ----- Method: TextMorph>>click: (in category 'event handling') ----- + click: evt + + self + handleInteraction: [self editor click: evt] + fromEvent: evt.! Item was changed: ----- Method: TextMorph>>enterClickableRegion: (in category 'editing') ----- enterClickableRegion: evt | index isLink | evt hand hasSubmorphs ifTrue:[^self]. - evt hand temporaryCursor ifNotNil:[^self]. paragraph ifNotNil:[ index := (paragraph characterBlockAtPoint: evt position) stringIndex. isLink := (paragraph text attributesAt: index forStyle: paragraph textStyle) anySatisfy:[:attr| attr mayActOnClick]. + isLink ifTrue:[evt hand showTemporaryCursor: Cursor webLink]. - isLink ifTrue:[Cursor webLink show] ifFalse:[Cursor normal show]. ]. ! Item was added: + ----- Method: TextMorph>>handlesMouseOver: (in category 'event handling') ----- + handlesMouseOver: evt + ^ self isPartsDonor not! Item was changed: ----- Method: TextMorph>>mouseDown: (in category 'event handling') ----- mouseDown: evt "Make this TextMorph be the keyboard input focus, if it isn't already, and repond to the text selection gesture." evt yellowButtonPressed ifTrue: [ "First check for option (menu) click" ^ self yellowButtonActivity: evt shiftPressed]. "Show the caret immediately on mouse down to give user feedback." self resetBlinkCursor. "If focus does not follow the mouse cursor and we click below everything, just grab the focus to not destroy the selection." ((self hasKeyboardFocus: evt hand) not and: [(self bounds containsPoint: evt position) not]) ifTrue: [evt hand newKeyboardFocus: self] ifFalse: [ evt hand newKeyboardFocus: self. self + handleInteraction: [self mouseEnter: evt. editor mouseDown: evt] - handleInteraction: [editor mouseDown: evt] fromEvent: evt].! Item was added: + ----- Method: TextMorph>>mouseEnter: (in category 'event handling') ----- + mouseEnter: evt + + self editor updateCursorForEvent: evt.! Item was added: + ----- Method: TextMorph>>mouseLeave: (in category 'event handling') ----- + mouseLeave: evt + + evt hand showTemporaryCursor: nil.! Item was changed: ----- Method: TextMorph>>mouseMove: (in category 'event handling') ----- mouseMove: evt + + evt redButtonPressed ifFalse: [ + self editor updateCursorForEvent: evt. + self enterClickableRegion: evt. + ^ self]. + + self + handleInteraction: [self editor mouseMove: evt] + fromEvent: evt.! - evt redButtonPressed ifFalse: [^ self enterClickableRegion: evt]. - self handleInteraction: [self editor mouseMove: evt] fromEvent: evt! Item was added: + ----- Method: TextMorph>>startDrag: (in category 'event handling') ----- + startDrag: evt + + [evt hand grabMorph: (TransferMorph withPassenger: self selection from: self)] + ensure: [evt hand releaseMouseFocus: self].! Item was changed: TextMorph subclass: #TextMorphForEditView instanceVariableNames: 'editView acceptOnCR' + classVariableNames: 'DraggableTextSelection' - classVariableNames: '' poolDictionaries: '' category: 'Morphic-Text Support'! Item was added: + ----- Method: TextMorphForEditView class>>draggableTextSelection (in category 'preferences') ----- + draggableTextSelection + + <preference: 'Draggable Text Selections' + categoryList: #(editing mouse Morphic) + description: 'Whether you can drag-and-drop selections in text morphs.' + type: #Boolean> + + ^ DraggableTextSelection ifNil: [false]! Item was added: + ----- Method: TextMorphForEditView class>>draggableTextSelection: (in category 'preferences') ----- + draggableTextSelection: aBoolean + + DraggableTextSelection := aBoolean. + + TextMorphForEditView allInstancesDo: [:tm | + tm dragEnabled: aBoolean; dropEnabled: aBoolean].! Item was added: + ----- Method: TextMorphForEditView>>acceptDroppingMorph:event: (in category 'dropping/grabbing') ----- + acceptDroppingMorph: aTransferMorph event: evt + "Accept a text to be inserted at the event/cursor position. Either remove or keep the source text depending on the transfer morph's copy state." + + self removeProperty: #waitingForTextDrag. + + self + handleInteraction: [ + aTransferMorph shouldCopy + ifFalse: [(aTransferMorph source respondsTo: #editor) + ifTrue: [aTransferMorph source editor destructiveBackWord]]. + self editor addText: aTransferMorph passenger asText event: evt] + fromEvent: evt. + + self flag: #hack. "mt: Shout background styling restores the selection, which interferes here. *sigh*" + self editView instVarNamed: #selectionInterval put: nil. + (aTransferMorph source respondsTo: #editView) + ifTrue: [aTransferMorph source editView instVarNamed: #selectionInterval put: nil.]! Item was changed: ----- Method: TextMorphForEditView>>initialize (in category 'initialization') ----- initialize + super initialize. + + self acceptOnCR: false. + self dragEnabled: self class draggableTextSelection. + self dropEnabled: self class draggableTextSelection.! - acceptOnCR := false! Item was added: + ----- Method: TextMorphForEditView>>wantsDroppedMorph:event: (in category 'dropping/grabbing') ----- + wantsDroppedMorph: aMorph event: evt + + ^ ((super wantsDroppedMorph: aMorph event: evt) + and: [aMorph isKindOf: TransferMorph]) + and: [aMorph passenger isString or: [aMorph passenger isText]]!

1 0

The Trunk: Graphics-mt.390.mcz
by commits＠source.squeak.org 20 Dec '17

20 Dec '17

Marcel Taeumel uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-mt.390.mcz ==================== Summary ==================== Name: Graphics-mt.390 Author: mt Time: 20 December 2017, 3:40:16.782079 pm UUID: c66476ae-c191-8f40-a0d4-ef72c7022d77 Ancestors: Graphics-eem.389 Adds a text cursor. =============== Diff against Graphics-eem.389 =============== Item was changed: Form subclass: #Cursor instanceVariableNames: '' + classVariableNames: 'BlankCursor BottomLeftCursor BottomRightCursor CornerCursor CrossHairCursor CurrentCursor DownCursor MarkerCursor MenuCursor MoveCursor NormalCursor OriginCursor ReadCursor ResizeLeftCursor ResizeTopCursor ResizeTopLeftCursor ResizeTopRightCursor RightArrowCursor SquareCursor TargetCursor TextCursor TopLeftCursor TopRightCursor UpCursor UseBiggerCursors WaitCursor WebLinkCursor WriteCursor XeqCursor' - classVariableNames: 'BlankCursor BottomLeftCursor BottomRightCursor CornerCursor CrossHairCursor CurrentCursor DownCursor MarkerCursor MenuCursor MoveCursor NormalCursor OriginCursor ReadCursor ResizeLeftCursor ResizeTopCursor ResizeTopLeftCursor ResizeTopRightCursor RightArrowCursor SquareCursor TargetCursor TopLeftCursor TopRightCursor UpCursor UseBiggerCursors WaitCursor WebLinkCursor WriteCursor XeqCursor' poolDictionaries: '' category: 'Graphics-Display Objects'! !Cursor commentStamp: '<historical>' prior: 0! I am a Form that is a possible appearance for a mouse cursor. My size is always 16x16, ever since the original implementation on the Alto. There are many examples available in the "current cursor" category of class methods. For example, "Cursor normal" and "Cursor wait". For example: Cursor wait show ! Item was added: + ----- Method: Cursor class>>initText (in category 'class initialization') ----- + initText + + TextCursor := + (Cursor + extent: 16 @ 16 + fromArray: #( + 2r0000000000000000 + 2r0000111011100000 + 2r0000000100000000 + 2r0000000100000000 + 2r0000000100000000 + 2r0000000100000000 + 2r0000000100000000 + 2r0000000100000000 + 2r0000000100000000 + 2r0000000100000000 + 2r0000000100000000 + 2r0000000100000000 + 2r0000000100000000 + 2r0000111011100000 + 2r0000000000000000 + 2r0) + offset: -7 @ -7). + + ! Item was changed: ----- Method: Cursor class>>initialize (in category 'class initialization') ----- initialize "Create all the standard cursors..." self initOrigin. self initRightArrow. self initMenu. self initCorner. self initRead. self initWrite. self initWait. BlankCursor := Cursor new. self initXeq. self initSquare. self initNormalWithMask. self initCrossHair. self initMarker. self initUp. self initDown. self initMove. self initBottomLeft. self initBottomRight. self initResizeLeft. self initResizeTop. self initResizeTopLeft. self initResizeTopRight. + self initText. self initTopLeft. self initTopRight. self makeCursorsWithMask. "Cursor initialize" ! Item was added: + ----- Method: Cursor class>>text (in category 'constants') ----- + text + ^ TextCursor!

1 0

How do I open my clock morph full screen?
by Louis LaBrunda 20 Dec '17

20 Dec '17

Hi Everybody, I now have a clock morph that uses a picture of a clock as the clock face and pictures of clock hands for the hands. I would like to open this full screen and without any other Squeak windows open. Any ideas? Lou -- Louis LaBrunda Keystone Software Corp. SkypeMe callto://PhotonDemon

2 4

← Newer
1
...
5
6
7
8
9
10
11
...
16
Older →

Jump to page: