fixed ToListDisabledSelectionElementEventHandler>>listDisabledSelectionChangedEvent:

Author: plantec

src/Toplo-Examples/ToSandBox.class.st

@@ -10176,8 +10176,7 @@ ToSandBox class >> listWithData: aCollection [
 			holder fontSize ifNil: [
 				holder fontSize: (rand nextIntegerBetween: 10 and: 16) ].
 			label := (ToLabel text:
-					          holder position asString , ': '
-					          , dataItem asString)
+					          holder position asString , ': ' , dataItem asString)
 				         fontSize: holder fontSize;
 				         yourself.
 			triplet startElement: ToIconicRemoveButton new.
@@ -10234,8 +10233,9 @@ ToSandBox class >> listWithData: aCollection [
 											  labelText: 'Unable/disable';
 											  clickAction: [
 													  idxes do: [ :idx |
-																  (bar nodeContainerAt: idx) disabled:
-																		  (bar nodeContainerAt: idx) isEnabled ] ];
+																  (bar isEnabledAtPosition: idx)
+																	  ifTrue: [ bar disabledAtPosition: idx ]
+																	  ifFalse: [ bar enabledAtPosition: idx ] ] ];
 											  yourself).
 									 m addItem: (ToMenuItem new
 											  labelText: 'Unselectable';

src/Toplo-Widget-Circular/ToCircularMenuNode.class.st

@@ -39,6 +39,21 @@ ToCircularMenuNode >> applyConfiguration [
 	self fitContent
 ]
 
+{ #category : #'event handling' }
+ToCircularMenuNode >> enablementChangedEvent: anEvent [
+
+	self holder nodeContainer flagAsDisabled: self isDisabled
+]
+
+{ #category : #initialization }
+ToCircularMenuNode >> initialize [
+
+	super initialize.
+	self
+		addEventFilterOn: ToEnablementChangedEvent
+		do: [ :event | event sendTo: self ]
+]
+
 { #category : #'t - item node' }
 ToCircularMenuNode >> installEventDelegatorOnItem [
 

src/Toplo-Widget-List/TToInnerFiniteListElement.trait.st

@@ -154,6 +154,7 @@ TToInnerFiniteListElement >> onItemRangeChanged: aPositionStart itemCount: anIte
 		pos := container holder position.
 		(pos >= aPositionStart and: [ pos < (aPositionStart + anItemCount) ])
 			ifTrue: [
+				container holder initializeNodeSelections.
 				container requestConfiguration ] ]
 ]
 

src/Toplo-Widget-List/TToInnerListElement.trait.st

@@ -168,14 +168,6 @@ TToInnerListElement >> partlyVisibleNodesDo: aBlock [
 	^ self shouldBeImplemented 
 ]
 
-{ #category : #'t - inner list element' }
-TToInnerListElement >> postponeAction: aValuable for: aTarget [
-
-	self dataSourceManager postponeAction: aValuable for: aTarget.
-	" ensure a layout here to trigger the action running"
-	self requestLayout
-]
-
 { #category : #'t - inner list element' }
 TToInnerListElement >> postponeCommand: aCommand [
 

src/Toplo-Widget-List/TToItemListUser.trait.st

@@ -145,6 +145,18 @@ TToItemListUser >> isItemContainer [
 	^ true
 ]
 
+{ #category : #'t - item list user - disable/ enable' }
+TToItemListUser >> isItemDisabled: anItem [
+
+	self itemList isDisabledAtPosition: anItem positionInList
+]
+
+{ #category : #'t - item list user - disable/ enable' }
+TToItemListUser >> isItemEnabled: anItem [
+
+	self itemList isEnabledAtPosition: anItem positionInList
+]
+
 { #category : #'t - item list user - configuration' }
 TToItemListUser >> isScrollable [
 

src/Toplo-Widget-List/TToPostponedCommandManager.trait.st

@@ -50,14 +50,6 @@ TToPostponedCommandManager >> nextFinalStepCommand [
 	^ self finalStepCommands removeFirst
 ]
 
-{ #category : #'t - postponed command manager' }
-TToPostponedCommandManager >> postponeAction: aValuable for: aTarget [
-
-	self postponeCommand: (ToListDataSourceActionCommand new
-			 action: [ aValuable cull: aTarget ];
-			 yourself)
-]
-
 { #category : #'t - postponed command manager' }
 TToPostponedCommandManager >> postponeCommand: aCommand [
 

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

@@ -11,7 +11,7 @@ Class {
 		'mouseMoveReplayRequested',
 		'innerElementClass',
 		'innerElement',
-		'postponedActions'
+		'postponedCommands'
 	],
 	#category : #'Toplo-Widget-List-Core'
 }
@@ -64,12 +64,12 @@ ToBasicListElement >> checkMouseMoveReplayRequest [
 ]
 
 { #category : #layout }
-ToBasicListElement >> checkPostponedActions [
+ToBasicListElement >> checkPostponedCommands [
 
-	postponedActions ifEmpty: [ ^ self ].
-	postponedActions do: [ :action |
-		self innerElement postponeAction: action for: self ].
-	postponedActions reset
+	postponedCommands ifEmpty: [ ^ self ].
+	postponedCommands do: [ :cmd |
+		self innerElement postponeCommand: cmd].
+	postponedCommands reset
 ]
 
 { #category : #layout }
@@ -323,7 +323,7 @@ ToBasicListElement >> hiddenSelectionModel [
 ToBasicListElement >> initialize [
 
 	super initialize.
-	postponedActions := OrderedCollection new.
+	postponedCommands := OrderedCollection new.
 	mouseMoveReplayRequested := false.
 	selectionModeMap := IdentityDictionary new.
 
@@ -593,7 +593,7 @@ ToBasicListElement >> onLayoutDone [
 
 	super onLayoutDone.
 	self checkSelections.
-	self checkPostponedActions.
+	self checkPostponedCommands.
 	self checkMouseMoveReplayRequest
 ]
 
@@ -613,18 +613,19 @@ ToBasicListElement >> placeholderClass [
 { #category : #layout }
 ToBasicListElement >> postponeAction: aValuable [
 
-	innerElement ifNotNil: [ :inner |
-		^ inner postponeAction: aValuable for: self ].
-	postponedActions add: aValuable.
+	| cmd |
+	cmd := ToListDataSourceActionCommand action: aValuable.
+	innerElement ifNotNil: [ :inner | ^ inner postponeCommand: cmd ].
+	postponedCommands add: cmd.
 	self requestLayout
 ]
 
 { #category : #layout }
-ToBasicListElement >> postponeCommand: aCommand [
+ToBasicListElement >> postponeCommand: aCommand [ 
 
 	innerElement ifNotNil: [ :inner |
-		^ inner postponeCommand: aCommand ].
-	postponedActions add: [ self postponeCommand: aCommand  ].
+		^ inner postponeCommand: aCommand  ].
+	postponedCommands add: aCommand.
 	self requestLayout
 ]
 

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

@@ -7,6 +7,12 @@ Class {
 	#category : #'Toplo-Widget-List-InnerList'
 }
 
+{ #category : #accessing }
+ToListDataSourceActionCommand class >> action: aValuable [
+
+	^ self new action: aValuable
+]
+
 { #category : #accessing }
 ToListDataSourceActionCommand >> action [
 

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

@@ -18,5 +18,9 @@ ToListDisabledSelectionElementEventHandler >> listDisabledSelectionChangedEvent:
 	self updateSelectionFromEvent: anEvent.
 	anEvent selectionModel selectedIndexesIntervalsDo: [ :int |
 			listElement selectionMode makeDisabledUnselectable ifTrue: [
-				listElement selecter deselectInterval: int ] ]
+				listElement selecter deselectInterval: int ] ].
+	anEvent appliedCommand indexes do: [ :idx |
+		listElement dataSource notifyItemsChanged: (idx to: idx) ].
+	listElement requestUpdateSelectionMode:
+		listElement primarySelectionMode
 ]

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

@@ -297,13 +297,13 @@ ToListSelecter >> nextSelectableIndexToScrollTo [
 ToListSelecter >> onBasicCommandApplied: aCommand [
 
 	selectionChangedEventClass ifNil: [ ^ self ].
-	
+
 	element dispatchEvent: (ToListSelectionCommandAppliedEvent new
 			 command: aCommand;
 			 yourself).
 
 	element dispatchEvent: (selectionChangedEventClass new
-			 selectionModel: aCommand selectionModel;
+			 appliedCommand: aCommand;
 			 selectionOption: self selectionOption;
 			 yourself)
 ]