Merge 6e10498

src/Bloc/BlElement.class.st

@@ -3973,6 +3973,14 @@ BlElement >> width: aNumber [
 		c horizontal exact: aNumber ]
 ]
 
+{ #category : #'children accessing' }
+BlElement >> withAllChildren [
+	"Return a collection of all children including myself starting with me and ending with the bottom most child"
+	<return: #Array of: #BlElement>
+
+	^ Array streamContents: [ :aStream | self withAllChildrenDepthFirstDo: [ :eachParent | aStream nextPut: eachParent ] ]
+]
+
 { #category : #'api - children enumeration' }
 BlElement >> withAllChildrenAt: aPoint [
 	<return: #Collection of: #BlElement>
@@ -4035,6 +4043,15 @@ BlElement >> withAllChildrenBreadthFirstDo: aBlock [
 	self allChildrenBreadthFirstDo: aBlock
 ]
 
+{ #category : #'children accessing' }
+BlElement >> withAllChildrenDepthFirstDo: aBlock [
+	"Evaluate a block with me and all my children as an argument starting from me
+	up to the bottom most child"
+
+	aBlock value: self.
+	self allChildrenDepthFirstDo: aBlock
+]
+
 { #category : #'api - children enumeration' }
 BlElement >> withAllLeafChildrenAt: aPoint [
 	<return: #Collection of: #BlElement>

src/BlocHost-Morphic/BlBlocUIManagerNotification.class.st

@@ -82,7 +82,8 @@ BlBlocUIManagerNotification >> isFromMorphic [
 		ifTrue: [ ^ false ].
 	context := thisContext.
 	[ context notNil ]
-		whileTrue: [ (context receiver isKindOf: worldMorphClass)
+		whileTrue: [ 
+			(context receiver class includesBehavior: worldMorphClass)
 				ifTrue: [ ^ true ].
 			context := context sender ].
 	^ false