fixes anchored window closing (now use the BlElementToBeremovedFromParentEvent event).

plantec · plantec · commit 1497b64e2e62 · 2026-03-25T11:14:41.000+01:00
diff --git a/src/Toplo-Examples/ToSandBox.class.st b/src/Toplo-Examples/ToSandBox.class.st
@@ -2101,6 +2101,10 @@ ToSandBox class >> example_CircularMenuPane [
 	item icon: (iconProvider iconNamed: #outlined_sms).
 	circularMenu addItem: item.
 
+	item := ToToggleMenuItem new labelText: 'Toggle'.
+	item clickAction: [:evt | evt traceCr ].
+	circularMenu addItem: item.
+	
 	item := ToMenuItem new labelText: 'Inspect'.
 "	item constraints annulus sectorAngleWeight: 0.20."
 	item clickAction: [ space inspect ].
diff --git a/src/Toplo-Tests/ToAnchoredWindowManagerTest.class.st b/src/Toplo-Tests/ToAnchoredWindowManagerTest.class.st
@@ -186,7 +186,7 @@ ToAnchoredWindowManagerTest >> testElementPositionInSpaceChangedEvent [
 ]
 
 { #category : #tests }
-ToAnchoredWindowManagerTest >> testElementRemovedFromParentEvent [
+ToAnchoredWindowManagerTest >> testElementToBeRemovedFromParentEvent [
 
 	| win e windowManager closed |
 	e := ToElement new.
@@ -212,12 +212,6 @@ ToAnchoredWindowManagerTest >> testElementRemovedFromParentEvent [
 	self assert: windowManager currentWindow isNil
 ]
 
-{ #category : #tests }
-ToAnchoredWindowManagerTest >> testElementRemovedFromSceneGraphEvent [
-
-	self testElementRemovedFromParentEvent 
-]
-
 { #category : #tests }
 ToAnchoredWindowManagerTest >> testHasWindow [
 
diff --git a/src/Toplo-Widget-Accordion/ToAccordionElement.class.st b/src/Toplo-Widget-Accordion/ToAccordionElement.class.st
@@ -124,6 +124,12 @@ ToAccordionElement >> newBody [
 	^ ToAccordionBodyElement new
 ]
 
+{ #category : #'t - element with action' }
+ToAccordionElement >> newClickAction: aValuable [
+
+	^ self newCheckAction: aValuable
+]
+
 { #category : #'instance creation' }
 ToAccordionElement >> newHeader [ 
 
diff --git a/src/Toplo-Widget-Button/ToGeneralButtonSkin.class.st b/src/Toplo-Widget-Button/ToGeneralButtonSkin.class.st
@@ -55,7 +55,6 @@ ToGeneralButtonSkin >> installSkinEvent: anEvent [
 
 	super installSkinEvent: anEvent.
 	anEvent elementDo: [ :e |
-			e mouseCursor: Cursor normal.
 			e isSegmentedItem ifTrue: [
 					(e isKindOf: ToCheckbox) ifTrue: [
 							e
diff --git a/src/Toplo-Widget-Button/ToToggleButton.class.st b/src/Toplo-Widget-Button/ToToggleButton.class.st
@@ -18,6 +18,12 @@ ToToggleButton >> initialize [
 	self clickEventClass: ToCheckableChangedEvent
 ]
 
+{ #category : #'t - element with action' }
+ToToggleButton >> newClickAction: aValuable [
+
+	^ self newCheckAction: aValuable
+]
+
 { #category : #skin }
 ToToggleButton >> newRawSkin [ 
 
diff --git a/src/Toplo-Widget-List/TToInnerFiniteListElement.trait.st b/src/Toplo-Widget-List/TToInnerFiniteListElement.trait.st
@@ -126,6 +126,12 @@ TToInnerFiniteListElement >> innerElement [
 	^ self
 ]
 
+{ #category : #accessing }
+TToInnerFiniteListElement >> layoutPositionsRange [
+
+	^ 1 to: self nodeContainers size
+]
+
 { #category : #'t - inner finite list element - initialization' }
 TToInnerFiniteListElement >> newNodeHolderFromDataSource: aDataSource [
 
diff --git a/src/Toplo-Widget-List/ToListDataSourceActionCommand.class.st b/src/Toplo-Widget-List/ToListDataSourceActionCommand.class.st
@@ -28,7 +28,7 @@ ToListDataSourceActionCommand >> action: aValuable [
 { #category : #application }
 ToListDataSourceActionCommand >> applyIn: anInfiniteElement [
 
-	action value
+	action cull: anInfiniteElement listElement
 ]
 
 { #category : #'infinite compatibility' }
diff --git a/src/Toplo-Widget-List/ToListDisabledSelectionElementEventHandler.class.st b/src/Toplo-Widget-List/ToListDisabledSelectionElementEventHandler.class.st
@@ -19,8 +19,11 @@ ToListDisabledSelectionElementEventHandler >> listDisabledSelectionChangedEvent:
 	anEvent selectionModel selectedIndexesIntervalsDo: [ :int |
 			listElement selectionMode makeDisabledUnselectable ifTrue: [
 				listElement selecter deselectInterval: int ] ].
-	anEvent appliedCommand indexes do: [ :idx |
-		listElement dataSource notifyItemsChanged: (idx to: idx) ].
-	listElement requestUpdateSelectionMode:
-		listElement primarySelectionMode
+
+	listElement postponeAction: [
+			anEvent appliedCommand indexes do: [ :idx |
+					(listElement layoutPositionsRange includes: idx) ifTrue: [
+						listElement dataSource notifyItemsChanged: (idx to: idx) ] ].
+			listElement requestUpdateSelectionMode:
+				listElement primarySelectionMode ]
 ]
diff --git a/src/Toplo-Widget-Menu/ToMenuItemElementSkin.class.st b/src/Toplo-Widget-Menu/ToMenuItemElementSkin.class.st
@@ -25,7 +25,6 @@ ToMenuItemElementSkin >> installSkinEvent: anEvent [
 
 	super installSkinEvent: anEvent.
 	anEvent elementDo: [ :e |
-		e mouseCursor: Cursor normal.
 		e geometry: (BlRoundedRectangleGeometry cornerRadius:
 				 (e valueOfTokenNamed: 'border-radius')) ]
 ]
diff --git a/src/Toplo-Widget-Menu/ToToggleMenuItem.class.st b/src/Toplo-Widget-Menu/ToToggleMenuItem.class.st
@@ -5,8 +5,6 @@ I'm one of the leave of menu composite.
 Class {
 	#name : #ToToggleMenuItem,
 	#superclass : #ToMenuItem,
-	#traits : 'TToCheckable',
-	#classTraits : 'TToCheckable classTrait',
 	#category : #'Toplo-Widget-Menu-Items'
 }
 
@@ -18,6 +16,12 @@ ToToggleMenuItem >> initialize [
 	self initializeAsCheckable 
 ]
 
+{ #category : #'t - element with action' }
+ToToggleMenuItem >> newClickAction: aValuable [
+
+	^ self newCheckAction: aValuable
+]
+
 { #category : #skin }
 ToToggleMenuItem >> newRawSkin [ 
 
diff --git a/src/Toplo/ToAnchoredWindowManager.class.st b/src/Toplo/ToAnchoredWindowManager.class.st
@@ -151,7 +151,7 @@ ToAnchoredWindowManager >> elementPositionInSpaceChangedEvent: anEvent [
 ]
 
 { #category : #'event handling' }
-ToAnchoredWindowManager >> elementRemovedFromParentEvent: anEvent [
+ToAnchoredWindowManager >> elementToBeRemovedFromParentEvent: anEvent [
 
 	self closeWindow
 ]
@@ -163,8 +163,7 @@ ToAnchoredWindowManager >> eventsToHandle [
 		  ToWindowRequest.
 		  ToOpenedClosedEvent.
 		  BlElementExtentChangedEvent.
-		  BlElementRemovedFromParentEvent.
-		  ToRemovedFromSpaceEvent.
+		  BlElementToBeRemovedFromParentEvent.
 		  BlElementPositionInSpaceChangedEvent.
 		  ToThemeInstalledEvent }
 ]
@@ -327,12 +326,6 @@ ToAnchoredWindowManager >> positionWindowOnEvent: anEvent context: aBlElementBou
 		context: aBlElementBoundsUpdateContext
 ]
 
-{ #category : #'event handling' }
-ToAnchoredWindowManager >> removedFromSpaceEvent: anEvent [
-
-	self closeWindow
-]
-
 { #category : #'window handling' }
 ToAnchoredWindowManager >> startWindow: aWindow onEvent: anEvent [
 
diff --git a/src/Toplo/ToPopupWindowManager.class.st b/src/Toplo/ToPopupWindowManager.class.st
@@ -143,6 +143,13 @@ ToPopupWindowManager >> defaultWindowStarter [
 	^ ToStandardPopupStarter new
 ]
 
+{ #category : #'event handling' }
+ToPopupWindowManager >> elementToBeRemovedFromParentEvent: anEvent [
+
+	super elementToBeRemovedFromParentEvent: anEvent.
+	delayedPopupHandler cleanUpCheckerIn: anchorElement 
+]
+
 { #category : #'api - accessing' }
 ToPopupWindowManager >> eventsToHandle [
 
@@ -343,13 +350,6 @@ ToPopupWindowManager >> popupOnPressed: aBoolean [
 	delayedPopupHandler activateOnPressed: popupOnPressed
 ]
 
-{ #category : #'event handling' }
-ToPopupWindowManager >> removedFromSpaceEvent: anEvent [
-
-	super removedFromSpaceEvent: anEvent.
-	delayedPopupHandler cleanUpCheckerIn: anchorElement 
-]
-
 { #category : #'window handling' }
 ToPopupWindowManager >> requestCloseWindowOnEvent: anEvent [
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ ToGeneralButtonSkin >> installSkinEvent: anEvent [`
`55`	`55`
`56`	`56`	`super installSkinEvent: anEvent.`
`57`	`57`	`anEvent elementDo: [ :e \|`
`58`		`- e mouseCursor: Cursor normal.`
`59`	`58`	`e isSegmentedItem ifTrue: [`
`60`	`59`	`(e isKindOf: ToCheckbox) ifTrue: [`
`61`	`60`	`e`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ ToListDataSourceActionCommand >> action: aValuable [`
`28`	`28`	`{ #category : #application }`
`29`	`29`	`ToListDataSourceActionCommand >> applyIn: anInfiniteElement [`
`30`	`30`
`31`		`- action value`
	`31`	`+ action cull: anInfiniteElement listElement`
`32`	`32`	`]`
`33`	`33`
`34`	`34`	`{ #category : #'infinite compatibility' }`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ ToMenuItemElementSkin >> installSkinEvent: anEvent [`
`25`	`25`
`26`	`26`	`super installSkinEvent: anEvent.`
`27`	`27`	`anEvent elementDo: [ :e \|`
`28`		`- e mouseCursor: Cursor normal.`
`29`	`28`	`e geometry: (BlRoundedRectangleGeometry cornerRadius:`
`30`	`29`	`(e valueOfTokenNamed: 'border-radius')) ]`
`31`	`30`	`]`