Fix to do list example

pharo-graphics · Jul 18, 2024 · d5a28e5 · d5a28e5
1 parent 1f8b1c0
commit d5a28e5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/src/Spec-Toplo/SpToploDropListAdapter.class.st b/src/Spec-Toplo/SpToploDropListAdapter.class.st
@@ -24,16 +24,16 @@ SpToploDropListAdapter >> buildWidget [
 { #category : #factory }
 SpToploDropListAdapter >> newItemElementFor: node holder: holder [
 
-	model hasIcons ifFalse: [ 
+	model hasIcons ifFalse: [
 		^ node addChild:
-			(ToLabel text: holder dataItem asString)
+			(ToLabel text: (model displayForItem: holder) asRopedText)
 				hMatchParent;
 				yourself ].
 
 	node addChild:
 		(ToLabeledIcon new
-			labelText: (model displayForItem: holder dataItem);
-			icon: (ToImage inner: (model getIconFor: holder dataItem));
+			labelText: (model displayForItem: holder);
+			icon: (ToImage inner: (model getIconFor: holder));
 			startInterspace: 10;
 			hMatchParent;
 			yourself)

diff --git a/src/Spec-Toplo/SpToploListAdapter.class.st b/src/Spec-Toplo/SpToploListAdapter.class.st
@@ -34,20 +34,19 @@ SpToploListAdapter >> isNonEditableRow: aRow column: aColumn [
 { #category : #'instance creation' }
 SpToploListAdapter >> newItemElementFor: node holder: holder [
 
-	self model hasIcons ifFalse: [ 
-		^ node addChild:
-			(ToLabel text: holder dataItem asString)
-				hMatchParent;
-				yourself ].
-
-	node addChild:
-		(ToLabeledIcon new
-			label: (ToLabel
-				text: (model displayValueFor: holder dataItem) asRopedText);
-			icon: (ToImage inner: (model iconFor: holder dataItem));
+	| labeledIcon |
+	labeledIcon :=
+		ToLabeledIcon new
 			startInterspace: 10;
 			hMatchParent;
-			yourself)
+			yourself.
+
+	model hasIcons ifTrue: [
+		labeledIcon iconImage: (model iconFor: holder) ].
+
+	labeledIcon labelText: (model displayValueFor: holder) asRopedText.
+
+	node addChild: labeledIcon
 ]
 
 { #category : #refreshing }