--- a/MenuEditor.st Mon Jan 09 11:38:28 2006 +0100
+++ b/MenuEditor.st Tue Jan 10 14:32:38 2006 +0100
@@ -1934,8 +1934,8 @@
canDrop:aContext
"return true, if the DropContext can be dropped into the list of items.
- The dropable objects are already validated by: #dropEnter:
- "
+ The dropable objects are already validated by: #dropEnter:"
+
^ (dropOverLine notNil and:[dropOverLine ~~ 0])
!
--- a/UIPainter.st Mon Jan 09 11:38:28 2006 +0100
+++ b/UIPainter.st Tue Jan 10 14:32:38 2006 +0100
@@ -4753,16 +4753,16 @@
!UIPainter::TreeView methodsFor:'drag & drop'!
-canDrop:anObjectOrCollection
- "can drop ? delegate to canvas"
-
- ^ self canvas canDrop:anObjectOrCollection
+canDrop:aCollectionOfDropObjects
+ "can drop ? -> delegate to canvas"
+
+ ^ self canvas canDrop:aCollectionOfDropObjects
!
-drop:anObjectOrCollection at:aPoint
- "drop objects ? delegate to canvas"
-
- self canvas drop:anObjectOrCollection at:aPoint
+drop:aCollectionOfDropObjects at:aPoint
+ "drop objects -> delegate to canvas"
+
+ self canvas drop:aCollectionOfDropObjects at:aPoint
! !
!UIPainter::TreeView methodsFor:'enumerating'!
--- a/UIPainterView.st Mon Jan 09 11:38:28 2006 +0100
+++ b/UIPainterView.st Tue Jan 10 14:32:38 2006 +0100
@@ -493,11 +493,11 @@
!UIPainterView methodsFor:'drag & drop'!
-canDrop:something
+canDrop:aCollectionOfDropObjects
"returns true if something can be dropped"
- (something size == 1 and:[self enabled and:[self numberOfSelections <= 1]]) ifTrue:[
- ^ something first theObject isKindOf:UISpecification
+ (aCollectionOfDropObjects size == 1 and:[self enabled and:[self numberOfSelections <= 1]]) ifTrue:[
+ ^ aCollectionOfDropObjects first theObject isKindOf:UISpecification
].
^ false
!
@@ -543,30 +543,30 @@
^ aView specClass supportsSubComponents.
!
-drop:anObjectOrCollection at:aPoint
+drop:aCollectionOfDropObjects at:aPoint
|spec newSel oldSel dragOffset widg doit|
doit := true.
self selection notNil ifTrue:[
- oldSel := self singleSelection.
-
- "/ search selections hierarchy for a widget into which we can paste
- widg := oldSel.
- [widg isNil or:[self canPasteInto:widg]] whileFalse:[
- widg notNil ifTrue:[
- widg := widg container
- ].
- ].
-
- oldSel := nil.
- self setSelection:widg withRedraw:true.
+ oldSel := self singleSelection.
+
+ "/ search selections hierarchy for a widget into which we can paste
+ widg := oldSel.
+ [widg isNil or:[self canPasteInto:widg]] whileFalse:[
+ widg notNil ifTrue:[
+ widg := widg container
+ ].
+ ].
+
+ oldSel := nil.
+ self setSelection:widg withRedraw:true.
].
- spec := (anObjectOrCollection at:1) theObject.
+ spec := (aCollectionOfDropObjects at:1) theObject.
doit ifTrue:[
- dragOffset := DragAndDropManager dragOffsetQuerySignal query.
- newSel := self pasteSpecifications:spec keepLayout:false at:aPoint - dragOffset.
-
- self select:(oldSel ? newSel)
+ dragOffset := DragAndDropManager dragOffsetQuerySignal query.
+ newSel := self pasteSpecifications:spec keepLayout:false at:aPoint - dragOffset.
+
+ self select:(oldSel ? newSel)
].
"Modified: / 18.3.1999 / 18:29:43 / stefan"
--- a/UISelectionPanel.st Mon Jan 09 11:38:28 2006 +0100
+++ b/UISelectionPanel.st Tue Jan 10 14:32:38 2006 +0100
@@ -1603,11 +1603,11 @@
!UISelectionPanel methodsFor:'drag & drop'!
-canDrop:something in:aComponent
- ^ self canPaste:(something collect:[:el| el theObject ]).
+canDrop:aCollectionOfDropObjects in:aComponent
+ ^ self canPaste:(aCollectionOfDropObjects collect:[:el| el theObject ]).
!
-drop:something in:aComponent at:aPoint
+drop:aCollectionOfDropObjects in:aComponent at:aPoint
|spc top|
@@ -1621,7 +1621,7 @@
^ self
].
] ifFalse:[
- spc := something collect:[:el| el theObject].
+ spc := aCollectionOfDropObjects collect:[:el| el theObject].
].
self paste:spc.