The Trunk: Morphic-mt.1495.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Morphic-mt.1495.mcz

commits-2
Marcel Taeumel uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-mt.1495.mcz

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

Name: Morphic-mt.1495
Author: mt
Time: 22 July 2019, 12:07:10.880271 pm
UUID: 24e42526-45ab-4631-9cd6-521e7f95ea2c
Ancestors: Morphic-mt.1494

Makes auto-select in pluggable text morphs more robust.

=============== Diff against Morphic-mt.1494 ===============

Item was changed:
  ----- Method: PluggableTextMorph>>update: (in category 'updating') -----
  update: aSymbol
  aSymbol ifNil: [^self].
  aSymbol == #flash ifTrue: [^self flash].
 
  aSymbol == getTextSelector
  ifTrue: [
  self setText: self getText.
  getSelectionSelector
  ifNotNil: [self setSelection: self getSelection].
  ^ self].
  aSymbol == getSelectionSelector
  ifTrue: [^self setSelection: self getSelection].
 
  aSymbol == #acceptChanges ifTrue: [^ self accept].
  aSymbol == #revertChanges ifTrue: [^ self cancel].
 
  (aSymbol == #autoSelect and: [getSelectionSelector notNil])
  ifTrue:
  [self handleEdit:
  [(textMorph editor)
  abandonChangeText; "no replacement!!"
  setSearch: model autoSelectString;
+ findAgainNow "do not reset search string"]].
- findAgain]].
  aSymbol == #clearUserEdits ifTrue: [^self hasUnacceptedEdits: false].
  aSymbol == #wantToChange
  ifTrue:
  [self canDiscardEdits ifFalse: [^self promptForCancel].
  ^self].
  aSymbol == #appendEntry
  ifTrue:
  [self handleEdit: [self appendEntry].
  ^self refreshWorld].
  aSymbol == #appendEntryLater
  ifTrue: [self handleEdit: [self appendEntry]].
  aSymbol == #clearText
  ifTrue:
  [self handleEdit: [self changeText: Text new].
  ^self refreshWorld].
  aSymbol == #bs
  ifTrue:
  [self handleEdit: [self bsText].
  ^self refreshWorld].
  aSymbol == #codeChangedElsewhere
  ifTrue:
  [self hasEditingConflicts: true.
  ^self changed].
  aSymbol == #saveContents
  ifTrue:
  [^self saveContentsInFile].
  aSymbol == #showContents
  ifTrue:
  [^ self scrollToTop].
  !


Reply | Threaded
Open this post in threaded view
|

Re: The Trunk: Morphic-mt.1495.mcz

Chris Muller-3
Hi Marcel,

To clarify "more robust", is this:  when I select a method in a MessageSet of "senders of at:" and it highlights "at:" for me, _don't_ make that the search string for Cmd-g?

Or is this something else?  'Cuz I often want to bounce to the _next_ sender in the same method via Cmd-g...

On Mon, Jul 22, 2019 at 5:07 AM <[hidden email]> wrote:
Marcel Taeumel uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-mt.1495.mcz

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

Name: Morphic-mt.1495
Author: mt
Time: 22 July 2019, 12:07:10.880271 pm
UUID: 24e42526-45ab-4631-9cd6-521e7f95ea2c
Ancestors: Morphic-mt.1494

Makes auto-select in pluggable text morphs more robust.

=============== Diff against Morphic-mt.1494 ===============

Item was changed:
  ----- Method: PluggableTextMorph>>update: (in category 'updating') -----
  update: aSymbol
        aSymbol ifNil: [^self].
        aSymbol == #flash ifTrue: [^self flash].

        aSymbol == getTextSelector
                ifTrue: [
                        self setText: self getText.
                        getSelectionSelector
                                ifNotNil: [self setSelection: self getSelection].
                        ^ self].
        aSymbol == getSelectionSelector
                ifTrue: [^self setSelection: self getSelection].

        aSymbol == #acceptChanges ifTrue: [^ self accept].
        aSymbol == #revertChanges ifTrue: [^ self cancel].

        (aSymbol == #autoSelect and: [getSelectionSelector notNil])
                ifTrue:
                        [self handleEdit:
                                        [(textMorph editor)
                                                abandonChangeText; "no replacement!!"
                                                setSearch: model autoSelectString;
+                                               findAgainNow "do not reset search string"]].
-                                               findAgain]].
        aSymbol == #clearUserEdits ifTrue: [^self hasUnacceptedEdits: false].
        aSymbol == #wantToChange
                ifTrue:
                        [self canDiscardEdits ifFalse: [^self promptForCancel].
                        ^self].
        aSymbol == #appendEntry
                ifTrue:
                        [self handleEdit: [self appendEntry].
                        ^self refreshWorld].
        aSymbol == #appendEntryLater
                ifTrue: [self handleEdit: [self appendEntry]].
        aSymbol == #clearText
                ifTrue:
                        [self handleEdit: [self changeText: Text new].
                        ^self refreshWorld].
        aSymbol == #bs
                ifTrue:
                        [self handleEdit: [self bsText].
                        ^self refreshWorld].
        aSymbol == #codeChangedElsewhere
                ifTrue:
                        [self hasEditingConflicts: true.
                        ^self changed].
        aSymbol == #saveContents
                ifTrue:
                        [^self saveContentsInFile].
        aSymbol == #showContents
                ifTrue:
                        [^ self scrollToTop].
  !




Reply | Threaded
Open this post in threaded view
|

Re: The Trunk: Morphic-mt.1495.mcz

marcel.taeumel
Hi Chris,

it still sets the search string. No change in interaction here. This guards against semantic changes in #findAgain in the future.

#findAgain might overwrite the search string. #findAgainNow does not. So, in combination with #setSearch:, better use #findAgainNow instead of #findAgain.

Best,
Marcel

Am 24.07.2019 04:31:48 schrieb Chris Muller <[hidden email]>:

Hi Marcel,

To clarify "more robust", is this:  when I select a method in a MessageSet of "senders of at:" and it highlights "at:" for me, _don't_ make that the search string for Cmd-g?

Or is this something else?  'Cuz I often want to bounce to the _next_ sender in the same method via Cmd-g...

On Mon, Jul 22, 2019 at 5:07 AM <[hidden email]> wrote:
Marcel Taeumel uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-mt.1495.mcz

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

Name: Morphic-mt.1495
Author: mt
Time: 22 July 2019, 12:07:10.880271 pm
UUID: 24e42526-45ab-4631-9cd6-521e7f95ea2c
Ancestors: Morphic-mt.1494

Makes auto-select in pluggable text morphs more robust.

=============== Diff against Morphic-mt.1494 ===============

Item was changed:
  ----- Method: PluggableTextMorph>>update: (in category 'updating') -----
  update: aSymbol
        aSymbol ifNil: [^self].
        aSymbol == #flash ifTrue: [^self flash].

        aSymbol == getTextSelector
                ifTrue: [
                        self setText: self getText.
                        getSelectionSelector
                                ifNotNil: [self setSelection: self getSelection].
                        ^ self].
        aSymbol == getSelectionSelector
                ifTrue: [^self setSelection: self getSelection].

        aSymbol == #acceptChanges ifTrue: [^ self accept].
        aSymbol == #revertChanges ifTrue: [^ self cancel].

        (aSymbol == #autoSelect and: [getSelectionSelector notNil])
                ifTrue:
                        [self handleEdit:
                                        [(textMorph editor)
                                                abandonChangeText; "no replacement!!"
                                                setSearch: model autoSelectString;
+                                               findAgainNow "do not reset search string"]].
-                                               findAgain]].
        aSymbol == #clearUserEdits ifTrue: [^self hasUnacceptedEdits: false].
        aSymbol == #wantToChange
                ifTrue:
                        [self canDiscardEdits ifFalse: [^self promptForCancel].
                        ^self].
        aSymbol == #appendEntry
                ifTrue:
                        [self handleEdit: [self appendEntry].
                        ^self refreshWorld].
        aSymbol == #appendEntryLater
                ifTrue: [self handleEdit: [self appendEntry]].
        aSymbol == #clearText
                ifTrue:
                        [self handleEdit: [self changeText: Text new].
                        ^self refreshWorld].
        aSymbol == #bs
                ifTrue:
                        [self handleEdit: [self bsText].
                        ^self refreshWorld].
        aSymbol == #codeChangedElsewhere
                ifTrue:
                        [self hasEditingConflicts: true.
                        ^self changed].
        aSymbol == #saveContents
                ifTrue:
                        [^self saveContentsInFile].
        aSymbol == #showContents
                ifTrue:
                        [^ self scrollToTop].
  !