fixed Accordeon to work again after recent changes in Toplo/TripleEle…

…ment
pharo-graphics · Jan 28, 2025 · fc4da37 · fc4da37
1 parent 6af26c6
commit fc4da37
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/src/BaselineOfToplo/BaselineOfToplo.class.st b/src/BaselineOfToplo/BaselineOfToplo.class.st
@@ -70,10 +70,16 @@ BaselineOfToplo >> registerPackages: spec [
 		package: #'Toplo-Widget-Button'
 		with: [
 		spec requires: #( #Toplo #'Toplo-Widget-Image' #'Toplo-Theme' ) ].
+
 	spec
 		package: #'Toplo-Widget-Button-Tests'
 		with: [ spec requires: #( #Toplo #'Toplo-Widget-Button' ) ].
 
+	spec
+		package: #'Toplo-Widget-Accordion'
+		with: [
+		spec requires: #( #Toplo #'Toplo-Widget-Button' #'Toplo-Theme' ) ].
+
 	spec
 		package: #'Toplo-Widget-Image'
 		with: [ spec requires: #( #Toplo #'Toplo-Theme' ) ].

diff --git a/src/Toplo-Widget-Accordion/ToAccordionListNodeManager.class.st b/src/Toplo-Widget-Accordion/ToAccordionListNodeManager.class.st
@@ -15,7 +15,7 @@ ToAccordionListNodeManager >> buildNode: aNode [
 	aNode addChild: collapse at: 1
 ]
 
-{ #category : #'instance creation' }
+{ #category : #initialization }
 ToAccordionListNodeManager >> constraintNode: aNode [
 
 	aNode constraintsDo: [ :c |
@@ -36,7 +36,7 @@ ToAccordionListNodeManager >> newNodeForHolder: aNodeHolder [
 	^ ToAccordionNode new
 ]
 
-{ #category : #'instance creation' }
+{ #category : #initialization }
 ToAccordionListNodeManager >> unbuildNode: aNode [
 
 	aNode removeChildren.

diff --git a/src/Toplo-Widget-Accordion/ToAccordionXPElement.class.st b/src/Toplo-Widget-Accordion/ToAccordionXPElement.class.st
@@ -6,6 +6,8 @@ This version works but failed to honor the clicked skin event because  (which is
 Class {
 	#name : #ToAccordionXPElement,
 	#superclass : #ToElement,
+	#traits : 'TToButtonOwner + (TToTripletElement - {#tripletProperties:}) + TToLabeledIcon',
+	#classTraits : 'TToButtonOwner classTrait + TToTripletElement classTrait + TToLabeledIcon classTrait',
 	#instVars : [
 		'body',
 		'isCollapsed'
@@ -49,7 +51,7 @@ ToAccordionXPElement >> expand [
 ToAccordionXPElement >> initialize [
 
 	super initialize.
-	self initializeButtonHolder.
+	self initializeAsButtonHolder.
 	isCollapsed := true.
 	self height: 30.
 	self layout: BlLinearLayout vertical.
@@ -105,3 +107,9 @@ ToAccordionXPElement >> properties [
 
 	^ self button properties
 ]
+
+{ #category : #'t - triplet element - private - accessing' }
+ToAccordionXPElement >> tripletProperties [
+
+	^ self button tripletProperties
+]
diff --git a/src/Toplo-Widget-Accordion/ToBasicAccordionElement.class.st b/src/Toplo-Widget-Accordion/ToBasicAccordionElement.class.st
@@ -1,6 +1,8 @@
 Class {
 	#name : #ToBasicAccordionElement,
 	#superclass : #ToElement,
+	#traits : 'TToButtonOwner',
+	#classTraits : 'TToButtonOwner classTrait',
 	#instVars : [
 		'body',
 		'headerBuilder',
@@ -60,7 +62,7 @@ ToBasicAccordionElement >> expand [
 ToBasicAccordionElement >> initialize [
 
 	super initialize.
-	self initializeButtonHolder.
+	self initializeAsButtonHolder.
 	isCollapsed := true.
 	self height: 30.
 	self layout: BlLinearLayout vertical.