Squeak-dev April 2015

squeak-dev@lists.squeakfoundation.org

38 participants
642 discussions

The Trunk: ToolBuilder-Morphic-mt.109.mcz
by commits＠source.squeak.org 01 Apr '15

01 Apr '15

Marcel Taeumel uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-mt.109.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-mt.109 Author: mt Time: 1 April 2015, 9:14:10.308 am UUID: 9505fa1d-c308-cc45-89a2-8b3bab4b07ea Ancestors: ToolBuilder-Morphic-mt.108 Reverted path selection in tree to use #= instead of #==. Fixed the code to indicate the actual selection in the tree (and scroll to it if too large). =============== Diff against ToolBuilder-Morphic-mt.108 =============== Item was changed: ----- Method: PluggableTreeMorph>>selectPath:in: (in category 'selection') ----- selectPath: path in: listItem + path isEmpty ifTrue: [^self selection: nil]. + - path isEmpty ifTrue: [^self setSelectedMorph: nil]. listItem withSiblingsDo: [:each | + (each complexContents item = path first) ifTrue: [ - (each complexContents item == path first) ifTrue: [ each isExpanded ifFalse: [ each toggleExpandedState. self adjustSubmorphPositions. ]. each changed. path size = 1 ifTrue: [ + ^self selection: each complexContents - ^self setSelectedMorph: each ]. + each firstChild ifNil: [^self selection: nil]. - each firstChild ifNil: [^self setSelectedMorph: nil]. ^self selectPath: path allButFirst in: each firstChild ]. ]. + ^self selection: nil + + ! - ^self setSelectedMorph: nil!

1 0

Re: [squeak-dev] The Trunk: Tools-mt.565.mcz
by Eliot Miranda 01 Apr '15

01 Apr '15

Hi Marcel, this may have broken the FileList. At least after the latest update the FileList no longer opens up the tree of directories in the left-hand pane to the current directory. On Sun, Mar 29, 2015 at 5:44 AM, <commits(a)source.squeak.org> wrote: > Marcel Taeumel uploaded a new version of Tools to project The Trunk: > http://source.squeak.org/trunk/Tools-mt.565.mcz > > ==================== Summary ==================== > > Name: Tools-mt.565 > Author: mt > Time: 29 March 2015, 2:44:29.709 pm > UUID: f8216267-8713-0449-bef6-35fecc620960 > Ancestors: Tools-topa.564 > > Refactored toggle/expand code in IndentingListItemMorph. > > =============== Diff against Tools-topa.564 =============== > > Item was changed: > + ----- Method: > IndentingListItemMorph>>addChildrenForList:addingTo:withExpandedItems: (in > category 'container protocol - private') ----- > - ----- Method: > IndentingListItemMorph>>addChildrenForList:addingTo:withExpandedItems: (in > category 'private-container protocol') ----- > addChildrenForList: hostList addingTo: morphList withExpandedItems: > expandedItems > > firstChild ifNotNil: [ > firstChild withSiblingsDo: [ :aNode | aNode delete]. > ]. > firstChild := nil. > complexContents hasContents ifFalse: [^self]. > firstChild := hostList > addMorphsTo: morphList > from: complexContents contents > allowSorting: true > withExpandedItems: expandedItems > atLevel: indentLevel + 1. > ! > > Item was changed: > + ----- Method: IndentingListItemMorph>>canExpand (in category 'testing') > ----- > - ----- Method: IndentingListItemMorph>>canExpand (in category > 'accessing') ----- > canExpand > > ^complexContents hasContents! > > Item was added: > + ----- Method: IndentingListItemMorph>>collapse (in category 'container > protocol') ----- > + collapse > + > + self isExpanded ifFalse: [^ self]. > + > + self isExpanded: false. > + > + firstChild ifNotNil: [:collapsingNode | > + | toDelete | > + toDelete := OrderedCollection new. > + collapsingNode withSiblingsDo: [:aNode | aNode > recursiveAddTo: toDelete]. > + container noteRemovalOfAll: toDelete]. > + > + self changed.! > > Item was changed: > + ----- Method: IndentingListItemMorph>>complexContents (in category > 'accessing') ----- > - ----- Method: IndentingListItemMorph>>complexContents (in category > 'private-container protocol') ----- > complexContents > > ^complexContents! > > Item was added: > + ----- Method: IndentingListItemMorph>>expand (in category 'container > protocol') ----- > + expand > + > + | newChildren c | > + > + (self isExpanded or: [self canExpand not]) > + ifTrue: [^ self]. > + > + (c := self getChildren) ifEmpty: [ > + "Due to the guessing in #canExpand, it may still fail > here." > + ^ self]. > + > + self isExpanded: true. > + > + newChildren := container > + addSubmorphsAfter: self > + fromCollection: c > + allowSorting: true. > + > + firstChild := newChildren first.! > > Item was changed: > + ----- Method: IndentingListItemMorph>>hasIcon (in category 'testing') > ----- > - ----- Method: IndentingListItemMorph>>hasIcon (in category 'accessing') > ----- > hasIcon > "Answer whether the receiver has an icon." > ^ icon notNil! > > Item was changed: > + ----- Method: IndentingListItemMorph>>highlight (in category 'container > protocol - private') ----- > - ----- Method: IndentingListItemMorph>>highlight (in category > 'private-container protocol') ----- > highlight > > (self valueOfProperty: #wasRefreshed ifAbsent: [false]) > ifFalse: [self color: complexContents highlightingColor] > ifTrue: [self color: self color negated]. > > self changed. > > ! > > Item was changed: > + ----- Method: IndentingListItemMorph>>isFirstItem (in category > 'testing') ----- > - ----- Method: IndentingListItemMorph>>isFirstItem (in category > 'accessing') ----- > isFirstItem > ^owner submorphs first == self! > > Item was changed: > + ----- Method: IndentingListItemMorph>>isSoleItem (in category 'testing') > ----- > - ----- Method: IndentingListItemMorph>>isSoleItem (in category > 'accessing') ----- > isSoleItem > ^self isFirstItem and: [ owner submorphs size = 1 ]! > > Item was changed: > + ----- Method: IndentingListItemMorph>>openPath: (in category 'container > protocol - private') ----- > - ----- Method: IndentingListItemMorph>>openPath: (in category > 'private-container protocol') ----- > openPath: anArray > | found | > anArray isEmpty > ifTrue: [^ container setSelectedMorph: nil]. > found := nil. > self > withSiblingsDo: [:each | found > ifNil: [(each complexContents asString = > anArray first > or: [anArray first > isNil]) > ifTrue: [found := each]]]. > found > ifNil: ["try again with no case sensitivity" > self > withSiblingsDo: [:each | found > ifNil: [(each > complexContents asString sameAs: anArray first) > ifTrue: > [found := each]]]]. > found > ifNotNil: [found isExpanded > ifFalse: [found toggleExpandedState. > container adjustSubmorphPositions]. > found changed. > anArray size = 1 > ifTrue: [^ container setSelectedMorph: > found]. > ^ found firstChild > ifNil: [container setSelectedMorph: nil] > ifNotNil: [found firstChild openPath: > anArray allButFirst]]. > ^ container setSelectedMorph: nil! > > Item was changed: > + ----- Method: IndentingListItemMorph>>recursiveAddTo: (in category > 'container protocol - private') ----- > - ----- Method: IndentingListItemMorph>>recursiveAddTo: (in category > 'private-container protocol') ----- > recursiveAddTo: aCollection > > firstChild ifNotNil: [ > firstChild withSiblingsDo: [ :aNode | aNode > recursiveAddTo: aCollection]. > ]. > aCollection add: self > ! > > Item was changed: > + ----- Method: IndentingListItemMorph>>recursiveDelete (in category > 'container protocol - private') ----- > - ----- Method: IndentingListItemMorph>>recursiveDelete (in category > 'private-container protocol') ----- > recursiveDelete > > firstChild ifNotNil: [ > firstChild withSiblingsDo: [ :aNode | aNode > recursiveDelete]. > ]. > self delete > ! > > Item was changed: > + ----- Method: IndentingListItemMorph>>toggleExpandedState (in category > 'container protocol') ----- > - ----- Method: IndentingListItemMorph>>toggleExpandedState (in category > 'private-container protocol') ----- > toggleExpandedState > > + self isExpanded > + ifTrue: [self collapse] > + ifFalse: [self expand].! > - | newChildren toDelete c | > - > - isExpanded := isExpanded not. > - toDelete := OrderedCollection new. > - firstChild ifNotNil: [ > - firstChild withSiblingsDo: [ :aNode | aNode > recursiveAddTo: toDelete]. > - ]. > - container noteRemovalOfAll: toDelete. > - (isExpanded and: [complexContents hasContents]) ifFalse: [ > - ^self changed > - ]. > - (c := self getChildren) isEmpty ifTrue: [^self changed]. > - newChildren := container > - addSubmorphsAfter: self > - fromCollection: c > - allowSorting: true. > - firstChild := newChildren first. > - ! > > > -- best, Eliot

2 2

Jump to page: