cleaning WindowManager and related event handlers hierarchies

src/Toplo-Examples/ToSandBox.class.st

@@ -4568,7 +4568,6 @@ ToSandBox class >> example_toButtonWithElementTooltip [
 				 background: Color random;
 				 size: 70 @ 100;
 				 yourself) ].
-	but whenClickedDo: [ :ann | self inform: 'Button clicked' ].
 	but openInInnerWindow
 ]
 
@@ -4786,7 +4785,7 @@ ToSandBox class >> example_toKeepTooltipWindowOnMouseLeave [
 	| but  |
 	self flag: 'not working as expected'.
 	but := ToButton new.
-	but closeTooltipWindowOnMouseLeave: false.
+	but closeTooltipOnMouseLeave: false.
 	but labelText: 'Button with tooltip text'.
 	but tooltipText: ('This is a button', String cr, 'so, click on me...') asRopedText. 
 	but whenClickedDo: [ :ann | self inform: 'Button clicked' ].
@@ -4801,7 +4800,7 @@ ToSandBox class >> example_toKeepTooltipWindowOnMouseLeaveWithEditableLabel [
 	self flag: 'Check the elevation of the editor'.
 	but := ToButton new.
 	but labelText: 'Button with editable tooltip'.
-	but closeTooltipWindowOnMouseLeave: false.
+	but closeTooltipOnMouseLeave: false.
 	but tooltipBuilder: [ :win :theElement |
 		| lab |
 		lab := ToLabel text: ' keep mouse over with shift key to edit / Return to accept' asRopedText.

src/Toplo-Tests/TToElementWithTooltipTest.class.st

@@ -8,7 +8,7 @@ Class {
 }
 
 { #category : #tests }
-TToElementWithTooltipTest >> testCloseTooltipWindowOnMouseLeave [
+TToElementWithTooltipTest >> testCloseTooltipOnMouseLeave [
 
 	| e |
 	e := ToElement new.
@@ -27,12 +27,12 @@ TToElementWithTooltipTest >> testCloseTooltipWindowOnMouseLeave [
 ]
 
 { #category : #tests }
-TToElementWithTooltipTest >> testCloseTooltipWindowOnMouseLeave2 [
+TToElementWithTooltipTest >> testCloseTooltipOnMouseLeave2 [
 
 	| e |
 	e := ToElement new.
 	e size: 50@50.
-	e closeTooltipWindowOnMouseLeave: false.
+	e closeTooltipOnMouseLeave: false.
 	e tooltipPopupDelay: 10 milliSeconds.
 	space root addChild: e.
 	self assert: e currentTooltipWindow isNil.

src/Toplo-Tests/ToPopupWindowManagerTest.class.st

@@ -278,6 +278,25 @@ ToPopupWindowManagerTest >> testNoAutoCloseEvenAfterLongDelay [
 	self deny: closed
 ]
 
+{ #category : #tests }
+ToPopupWindowManagerTest >> testUseNoMouseButton [
+
+	| e windowManager event |
+	e := ToElement new.
+	e size: 100 asPoint.
+	space root addChild: e.
+	self waitTestingSpaces.
+
+	windowManager := ToPopupWindowManager new.
+	windowManager useNoMouseButton.
+	windowManager onInstalledIn: e.
+	event := BlMouseDownEvent primary.
+	event position: e bounds inSpace center.
+	BlSpace simulateEvent: event on: e.
+	self waitTestingSpaces.
+	self assert: windowManager currentWindow isNil.
+]
+
 { #category : #tests }
 ToPopupWindowManagerTest >> testUsePrimaryMouseButton [
 

src/Toplo-Tests/ToPropertyWriterTest.class.st

@@ -34,7 +34,7 @@ ToPropertyWriterTest >> testAnimationNeedPropertyWithReader [
 	propWriter animation:
 		(anim := ToPropertyColorTransitionAnimation new
 			         property: prop;
-			         duration: 5 milliSeconds).
+			         duration: 50 milliSeconds).
 	self should: [ propWriter writeTo: w ] raise: MessageNotUnderstood.
 
 	"now setup a reader and it should be ok "

src/Toplo-Tests/ToSpaceSkinStateApplicationPhaseTest.class.st

@@ -18,17 +18,15 @@ ToSpaceSkinStateApplicationPhaseTest >> testStartSkinPhases [
 
 	" shoud result in a requestSkin which do the installation if needed "
 	" The skin specific phase is added"
-	space when: ToSpaceSkinPhasesStarted doOnce: [
+	space addEventHandlerOn: ToSpaceSkinPhasesStarted doOnce: [
 		self assert: space frame phases size equals: nb + 2.
 		self assert: (space frame phases anySatisfy: [ :p |
 				 p isKindOf: ToSpaceSkinInstallerPhase ]).
 		self assert: (space frame phases anySatisfy: [ :p |
 				 p isKindOf: ToSpaceSkinStateApplicationPhase ]).
 		space close ].
-
-	space skinPhasesManager startSkinPhasesIn: space
-
 
+	space skinPhasesManager startSkinPhasesIn: space
 ]
 
 { #category : #tests }
@@ -39,20 +37,20 @@ ToSpaceSkinStateApplicationPhaseTest >> testStartStopSkinStatePhases [
 
 	started := false.
 
-	space when: ToSpaceSkinPhasesStarted doOnce: [
+	space addEventHandlerOn: ToSpaceSkinPhasesStarted doOnce: [
 		started := true.
 		" The skin specific phase is added"
 		self assert: space frame phases size equals: nb + 2.
 		self assert: (space frame phases anySatisfy: [ :p |
 				 p isKindOf: ToSpaceSkinInstallerPhase ]).
 		self assert: (space frame phases anySatisfy: [ :p |
 				 p isKindOf: ToSpaceSkinStateApplicationPhase ]) ].
-		
+
 	space startSkinPhases.
 	self assert: started.
 
 	stopped := false.
-	space when: ToSpaceSkinPhasesStopped doOnce: [
+	space addEventHandlerOn: ToSpaceSkinPhasesStopped doOnce: [
 		stopped := true.
 		" The skin specific phase is removed "
 		self assert: space frame phases size equals: nb.

src/Toplo-Tests/ToTooltipWindowTest.class.st

@@ -10,23 +10,23 @@ Class {
 { #category : #tests }
 ToTooltipWindowTest >> testContent [
 
-	| e windowHandler |
+	| e windowManager |
 
 	e := ToElement new  size: 100@100.
 	e tooltipContent: (ToLabel text: 'Tooltip content').
-	windowHandler := e tooltipWindowManager.
-	self assert: (windowHandler isKindOf: ToTooltipWindowManager).
+	windowManager := e tooltipWindowManager.
+	self assert: (windowManager isKindOf: ToTooltipWindowManager).
 	space root addChild: e.
 	"self waitTestingSpaces."
 
 	BlSpace simulateMouseMoveInside: e.
 	self waitTestingSpaces.
-	(windowHandler popupDelay + 100 milliSecond ) wait.
+	(windowManager popupDelay + 100 milliSecond ) wait.
 	self waitTestingSpaces.
 
-	self assert: (windowHandler currentWindow root firstChild isKindOf: ToLabel) .
-	self assert: windowHandler currentWindow root firstChild text asString equals: 'Tooltip content' .
-	^  windowHandler currentWindow
+	self assert: (windowManager currentWindow root firstChild isKindOf: ToLabel) .
+	self assert: windowManager currentWindow root firstChild text asString equals: 'Tooltip content' .
+	^  windowManager currentWindow
 ]
 
 { #category : #tests }

src/Toplo-Widget-List/ToListElementEventHandler.class.st

@@ -260,7 +260,7 @@ ToListElementEventHandler >> mouseDownEvent: anEvent [
 	self withTargetNodeFromEvent: anEvent do: [ :node |
 		node dispatchEvent: anEvent copy.
 		anEvent consume ].
-	target isFocused ifTrue: [ ^ self ].
+	(target isFocusable not or: [ target isFocused ]) ifTrue: [ ^ self ].
 	target requestFocus.
 	anEvent consume
 ]

src/Toplo-Widget-Menu/ToContextMenuWindowManager.class.st

@@ -16,6 +16,12 @@ ToContextMenuWindowManager >> elementEventHandlerClass [
 	^ ToElementWithContextMenuEventHandler
 ]
 
+{ #category : #'event handling' }
+ToContextMenuWindowManager >> elementPositionInSpaceChangedEvent: anEvent [
+
+	self currentWindowDo: [ :cw | cw close ] 
+]
+
 { #category : #initialization }
 ToContextMenuWindowManager >> initialize [
 

src/Toplo-Widget-Menu/ToElementWithContextMenuEventHandler.class.st

@@ -4,22 +4,14 @@ Class {
 	#category : #'Toplo-Widget-Menu-Context menu'
 }
 
-{ #category : #'element handlers' }
+{ #category : #'event handling' }
 ToElementWithContextMenuEventHandler >> contextMenuClosedEvent: anEvent [
 
-	anEvent windowManager = windowManager ifFalse: [ ^ self ].
-	windowManager onWindowClosed 
-]
-
-{ #category : #'element handlers' }
-ToElementWithContextMenuEventHandler >> contextMenuOpenedEvent: anEvent [
-
-	anEvent windowManager = windowManager ifFalse: [ ^ self ].
-	windowManager onWindowOpened
+	self windowClosedEvent: anEvent
 ]
 
 { #category : #'event handling' }
-ToElementWithContextMenuEventHandler >> elementPositionInSpaceChangedEvent: anEvent [
+ToElementWithContextMenuEventHandler >> contextMenuOpenedEvent: anEvent [
 
-	windowManager currentWindowDo: [ :cw | cw close ] 
+	self windowOpenedEvent: anEvent
 ]

src/Toplo-Widget-Menu/ToMenu.class.st

@@ -105,7 +105,7 @@ ToMenu >> newRawSkin [
 { #category : #'t - menu window model' }
 ToMenu >> popupEvent: anEvent [
 
-	(windowManager newWindowEvent: anEvent) popupEvent: anEvent
+	windowManager enqueuePopupTaskFromEvent: anEvent
 ]
 
 { #category : #'adding-removing' }

src/Toplo-Widget-Select/ToMultiSelectBarElement.class.st

@@ -119,6 +119,7 @@ ToMultiSelectBarElement >> initialize [
 	self primarySelectionMode makeDisabledUnselectable: true.
 	self secondarySelectionMode selectionOption masked: true.
 	self nodeHolderClass: ToMultiSelectHolder.
+	self focusability: BlFocusability ignore.
 	maxSelectedCount := 0.
 	keepPickOrder := false.
 	pickCount := 0.

src/Toplo-Widget-Select/ToSelectElement.class.st

@@ -41,6 +41,12 @@ ToSelectElement >> dataAccessor [
 	^ self popupListElement dataAccessor
 ]
 
+{ #category : #initialization }
+ToSelectElement >> defaultEventHandler [
+
+	^ ToSelectEventHandler new
+]
+
 { #category : #initialization }
 ToSelectElement >> defaultLayout [ 
 
@@ -106,12 +112,8 @@ ToSelectElement >> initialize [
 	self addChildren: {
 			self innerElement.
 			self iconContainer }.
-
-	self addEventHandlerOn: ToPlaceholderShownEvent do: [ :event |
-		self flag:
-			'The width of 16???. Why ? Anyway, it should be handled via a skin'.
-		event placeholder padding: (BlInsets left: (self valueOfTokenNamed: #'padding-XS')).
-		event placeholder layout alignCenterLeft ].
+
+	self addEventHandler: self defaultEventHandler.
 
 	" a select is made to be horizontal. the following constraints 
 	must be set here to initialize the resizers properly "

src/Toplo-Widget-Select/ToSelectEventHandler.class.st

@@ -1,29 +1,26 @@
 Class {
 	#name : #ToSelectEventHandler,
-	#superclass : #ToElementWithPopupEventHandler,
+	#superclass : #BlCustomEventHandler,
 	#category : #'Toplo-Widget-Select-Core'
 }
 
 { #category : #'event handling' }
 ToSelectEventHandler >> elementAddedToSceneGraphEvent: anEvent [
 
-	| select |
-	select := anEvent currentTarget.
-	select refresh 
-]
-
-{ #category : #'element handlers' }
-ToSelectEventHandler >> elementExtentChangedEvent: anEvent [
-
-	windowManager currentWindow ifNil: [ ^ self ].
-	windowManager applyPositionHookFromEvent: anEvent.
-	windowManager applySizeHookFromEvent: anEvent
+	anEvent currentTarget refresh 
 ]
 
 { #category : #'api - accessing' }
 ToSelectEventHandler >> eventsToHandle [
+	^ { BlElementAddedToSceneGraphEvent. ToPlaceholderShownEvent }
+]
+
+{ #category : #'event handling' }
+ToSelectEventHandler >> placeHolderShownEvent: anEvent [
 
-	^ super eventsToHandle , {
-		  BlElementAddedToSceneGraphEvent.
-		  BlElementExtentChangedEvent }
+	self flag:
+		'The width of 16???. Why ? Anyway, it should be handled via a skin'.
+	anEvent placeholder padding: (BlInsets left:
+			 (anEvent currentTarget valueOfTokenNamed: #'padding-XS')).
+	anEvent placeholder layout alignCenterLeft
 ]

src/Toplo-Widget-Select/ToSelectPopupWindowManager.class.st

@@ -45,10 +45,13 @@ ToSelectPopupWindowManager >> defaultSizeHook [
 	  theWindow width: theElement measuredWidth]
 ]
 
-{ #category : #accessing }
-ToSelectPopupWindowManager >> elementEventHandlerClass [ 
+{ #category : #'event handling' }
+ToSelectPopupWindowManager >> elementExtentChangedEvent: anEvent [
 
-	^ ToSelectEventHandler
+	super elementExtentChangedEvent: anEvent.
+	currentWindow ifNil: [ ^ self ].
+	self applyPositionHookFromEvent: anEvent.
+	self applySizeHookFromEvent: anEvent
 ]
 
 { #category : #accessing }
@@ -87,7 +90,7 @@ ToSelectPopupWindowManager >> minHeight: aNumber [
 	listElement minHeight: aNumber
 ]
 
-{ #category : #'mouse handlers' }
+{ #category : #'event handling' }
 ToSelectPopupWindowManager >> mouseDownInElementEvent: anEvent [
 
 	super mouseDownInElementEvent: anEvent.

src/Toplo/TToElementWithTooltip.trait.st

@@ -4,19 +4,19 @@ Trait {
 }
 
 { #category : #'t - element with tooltip' }
-TToElementWithTooltip >> closeTooltipWindowOnMouseLeave [
+TToElementWithTooltip >> closeTooltipOnMouseLeave [
 
 	"Set a help string to display to the user if he let the mouse over the widget (a tooltip)."
 
-	^ self userData at: #closeTooltipWindowOnMouseLeave ifAbsentPut: [ true ]
+	^ self tooltipWindowManager closeOnMouseLeave
 ]
 
 { #category : #'t - element with tooltip' }
-TToElementWithTooltip >> closeTooltipWindowOnMouseLeave: aBoolean [
+TToElementWithTooltip >> closeTooltipOnMouseLeave: aBoolean [
 
 	"Set a help string to display to the user if he let the mouse over the widget (a tooltip)."
 
-	self userData at: #closeTooltipWindowOnMouseLeave put: aBoolean
+	self tooltipWindowManager closeOnMouseLeave: aBoolean
 ]
 
 { #category : #'t - element with tooltip' }
@@ -28,7 +28,7 @@ TToElementWithTooltip >> currentTooltipWindow [
 { #category : #'t - element with tooltip' }
 TToElementWithTooltip >> hasOpenedTooltip [
 	" do not use #tooltipWindowHandler to avoid TooltipWindowHandler installation here "
-
+	self deprecated: 'Unless there are users. add an issue if this is the case'.
 	^ self currentTooltipWindow notNil
 ]