Merge pull request #2724 from jecisc/2590-We-can-get-two-times-the-mo…

…useEntermouseLeave-event-when-subscribing-to-the-eventHandler-of-a-Morph

2590-We-can-get-two-times-the-mouseEntermouseLeave-event-when-subscribing-to-the-eventHandler-of-a-Morph

src/Morphic-Core/Morph.class.st

@@ -2928,32 +2928,34 @@ Morph >> handleMouseDown: anEvent [
 { #category : #'events-processing' }
 Morph >> handleMouseEnter: anEvent [
 	"System level event handling."
-	(anEvent isDraggingEvent) ifTrue:[
-		(self handlesMouseOverDragging: anEvent) ifTrue:[
-			anEvent wasHandled: true.
-			self mouseEnterDragging: anEvent].
-		^ self eventHandler ifNotNil: [:handler | handler mouseEnterDragging: anEvent fromMorph: self ]].
-	self wantsBalloon
-		ifTrue:[anEvent hand triggerBalloonFor: self after: self balloonHelpDelayTime].
-	(self handlesMouseOver: anEvent) ifTrue:[
-		anEvent wasHandled: true.
-		self mouseEnter: anEvent ].
-	^ self eventHandler ifNotNil: [:handler | handler mouseEnter: anEvent fromMorph: self ].
+
+	anEvent isDraggingEvent
+		ifTrue: [ (self handlesMouseOverDragging: anEvent)
+				ifTrue: [ anEvent wasHandled: true.
+					self mouseEnterDragging: anEvent ].
+			^ self eventHandler ifNotNil: [ :handler | handler mouseEnterDragging: anEvent fromMorph: self ] ].
+	self wantsBalloon ifTrue: [ anEvent hand triggerBalloonFor: self after: self balloonHelpDelayTime ].
+
+	^ (self handlesMouseOver: anEvent)
+		ifTrue: [ anEvent wasHandled: true.
+			self mouseEnter: anEvent ]
+		ifFalse: [ self eventHandler ifNotNil: [ :handler | handler mouseEnter: anEvent fromMorph: self ] ]
 ]
 
 { #category : #'events-processing' }
 Morph >> handleMouseLeave: anEvent [
 	"System level event handling."
+
 	anEvent hand removePendingBalloonFor: self.
-	anEvent isDraggingEvent ifTrue:[
-		(self handlesMouseOverDragging: anEvent) ifTrue:[
-			anEvent wasHandled: true.
-			self mouseLeaveDragging: anEvent].
-		^ self eventHandler ifNotNil: [:handler | handler mouseLeave: anEvent fromMorph: self ]].
-	(self handlesMouseOver: anEvent) ifTrue:[
-		anEvent wasHandled: true.
-		self mouseLeave: anEvent ].
-	^ self eventHandler ifNotNil: [:handler | handler mouseLeave: anEvent fromMorph: self ]
+	anEvent isDraggingEvent
+		ifTrue: [ (self handlesMouseOverDragging: anEvent)
+				ifTrue: [ anEvent wasHandled: true.
+					self mouseLeaveDragging: anEvent ].
+			^ self eventHandler ifNotNil: [ :handler | handler mouseLeave: anEvent fromMorph: self ] ].
+	^ (self handlesMouseOver: anEvent)
+		ifTrue: [ anEvent wasHandled: true.
+			self mouseLeave: anEvent ]
+		ifFalse: [ self eventHandler ifNotNil: [ :handler | handler mouseLeave: anEvent fromMorph: self ] ]
 ]
 
 { #category : #'events-processing' }

src/Morphic-Tests/MockObjectForEventTests.class.st

@@ -0,0 +1,43 @@
+Class {
+	#name : #MockObjectForEventTests,
+	#superclass : #Object,
+	#instVars : [
+		'stringMorph',
+		'counter'
+	],
+	#category : #'Morphic-Tests-Event'
+}
+
+{ #category : #accessing }
+MockObjectForEventTests >> counter [
+	^ counter
+]
+
+{ #category : #accessing }
+MockObjectForEventTests >> counter: anObject [
+	counter := anObject
+]
+
+{ #category : #initialization }
+MockObjectForEventTests >> initialize [
+	super initialize.
+	counter := 0
+]
+
+{ #category : #accessing }
+MockObjectForEventTests >> mockStringMorph [
+	^ StringMorph new
+		contents: 'Test';
+		on: #mouseEnter send: #mouseEnter:from: to: self;
+		yourself
+]
+
+{ #category : #accessing }
+MockObjectForEventTests >> mouseEnter: a from: b [
+	counter := counter + 1
+]
+
+{ #category : #accessing }
+MockObjectForEventTests >> stringMorph [
+	^ stringMorph ifNil: [ stringMorph := self mockStringMorph ]
+]

src/Morphic-Tests/MorphicEventHandlerTest.class.st

@@ -73,6 +73,27 @@ MorphicEventHandlerTest >> testMouseEnterDraggingFromMorph [
 	self assert: ((morph handleMouseEnter: event) == true)
 ]
 
+{ #category : #tests }
+MorphicEventHandlerTest >> testMouseEnterEventIsNotDuplicated [
+	| mockObject window evt |
+	mockObject := MockObjectForEventTests new.
+
+	[ window := mockObject stringMorph openInWindow.
+	evt := MouseButtonEvent new
+		setType: nil
+		position: mockObject stringMorph center
+		which: MouseButtonEvent redButton
+		buttons: MouseButtonEvent redButton
+		hand: nil
+		stamp: nil.
+
+	self assert: mockObject counter equals: 0.
+
+	mockObject stringMorph handleMouseEnter: evt.
+	self assert: mockObject counter equals: 1 ]
+		ensure: [ window ifNotNil: #close ]
+]
+
 { #category : #'tests-events' }
 MorphicEventHandlerTest >> testMouseEnterFromMorph [