core: allow customizing objectInterface while dropping for droppee

hpi-swa · Feb 11, 2022 · b3dbb41 · b3dbb41
1 parent bd61eb3
commit b3dbb41
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/packages/Sandblocks-Core/SBBlock.class.st b/packages/Sandblocks-Core/SBBlock.class.st
@@ -1857,6 +1857,12 @@ SBBlock >> objectInterface [
 	^ self parentSandblock objectInterfaceNear: self at: #replace
 ]
 
+{ #category : #'object interface' }
+SBBlock >> objectInterfaceForDrop: aBlock near: anotherBlock at: aSymbol [
+
+	^ self objectInterfaceNear: anotherBlock at: aSymbol
+]
+
 { #category : #'object interface' }
 SBBlock >> objectInterfaceNear: aBlock at: aSymbol [
 

diff --git a/packages/Sandblocks-Core/SBCursorInsert.class.st b/packages/Sandblocks-Core/SBCursorInsert.class.st
@@ -145,6 +145,7 @@ SBCursorInsert >> enterWith: aCursor [
 	command suggestions ifNotEmpty: [:s |
 		aCursor editor suggestionMenu
 			suggestions: s;
+			focusOnOpen: false;
 			openNear: aCursor requestor: command]
 ]
 

diff --git a/packages/Sandblocks-Core/SBDragHelper.class.st b/packages/Sandblocks-Core/SBDragHelper.class.st
@@ -274,7 +274,10 @@ SBDragHelper >> mouseMove: anEvent [
 						ifFalse: [
 							self closestAdjacentTo: anEvent position in: blockAtCursor do: [:adjacent :before |
 								(morph
-									convertedFor: (blockAtCursor objectInterfaceNear: adjacent at: (before ifTrue: [#before] ifFalse: [#after]))
+									convertedFor: (blockAtCursor
+										objectInterfaceForDrop: morph
+										near: adjacent
+										at: (before ifTrue: [#before] ifFalse: [#after]))
 									do: [:res | {#insert. blockAtCursor. adjacent. before. res}]) ifNil: [{#replace. blockAtCursor}]]]]]
 		ifNil: [#(#none nil)].
 

diff --git a/packages/Sandblocks-Core/SBSuggestionMenu.class.st b/packages/Sandblocks-Core/SBSuggestionMenu.class.st
@@ -177,9 +177,11 @@ SBSuggestionMenu >> initialize [
 
 	focusShortcut := SBEditor anyShortcutForAction: #focusSuggestions.
 	self scroller
-		addMorphBack: (focusHint := SBStringMorph new contents: (focusShortcut
-			ifNotNil: ['Use ', (focusShortcut displayString, ' to focus')]
-			ifNil: ['Hover to focus']));
+		addMorphBack: (focusHint := SBStringMorph new
+			contents: (focusShortcut
+				ifNotNil: ['Use ', (focusShortcut displayString, ' to focus')]
+				ifNil: ['Hover to focus']);
+			opacity: 0.6);
 		addMorphBack: container
 ]