Skip to content

Commit 1ce760b

Browse files
committed
Fix buttons serialization and remove tooltips TU
1 parent 08efb97 commit 1ce760b

File tree

11 files changed

+55
-95
lines changed

11 files changed

+55
-95
lines changed

src/Toplo-Serialization-STON/ToButton.extension.st

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ ToButton >> stonUserDataOn: aIdentityDictionary [
2828
super stonUserDataOn: aIdentityDictionary.
2929

3030
"LabeledIcon"
31-
(self class usesTrait: TToElementWithLabeledIcon) ifTrue: [
32-
aIdentityDictionary at: #stonLabeledIcon put: self labeledIcon ].
31+
"(self class usesTrait: TToLabeledIcon) ifTrue: [
32+
aIdentityDictionary at: #stonLabeledIcon put: self labeledIcon ]."
3333

3434
"Checkable"
3535
self isCheckable ifFalse: [ ^ self ].

src/Toplo-Serialization-Stash/BlElement.extension.st

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,11 @@ BlElement >> allSetterAndGettersForMyStashAllTokens [
2828

2929

3030
]
31+
32+
{ #category : #'*Toplo-Serialization-Stash' }
33+
BlElement >> stashEnabled [
34+
35+
<stashAccessors>
36+
self isEnabled ifTrue: [ ^ { } ].
37+
^ { (#enabled: -> #isEnabled) }
38+
]
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
Extension { #name : #TToCheckable }
22

33
{ #category : #'*Toplo-Serialization-Stash' }
4-
TToCheckable >> allSetterAndGettersOfTraitForMyStash: aToElement [
4+
TToCheckable >> stashAccessorsForTToCheckable [
55

6+
<stashAccessors>
67
| settersAndGetters |
78
self isCheckable ifFalse: [ ^ { } ].
89
settersAndGetters := OrderedCollection new.
9-
settersAndGetters add: #checked.
10-
settersAndGetters add: #group.
10+
settersAndGetters add: #initializeCheckable onlySetOnStash.
11+
self checked ifTrue: [ settersAndGetters add: #checked ].
12+
self group ifNotNil: [ settersAndGetters add: #group ].
1113
^ settersAndGetters
1214
]

src/Toplo-Serialization-Stash/TToElementWithLabeledIcon.extension.st

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
Extension { #name : #TToElementWithTooltip }
22

33
{ #category : #'*Toplo-Serialization-Stash' }
4-
TToElementWithTooltip >> allSetterAndGettersOfTraitForMyStash: aToElement [
4+
TToElementWithTooltip >> stashAccessorsForTToElementWithTooltip [
5+
6+
<stashAccessors>
57

68
self hasTooltip ifFalse: [ ^ { } ].
7-
^ { #tooltipBuilder. #closeTooltipWindowOnMouseLeave . #tooltipPopupDelay }
9+
^ { #tooltipBuilder. #closeTooltipWindowOnMouseLeave.
10+
#tooltipPopupDelay }
811
]

src/Toplo-Serialization-Stash/TToEnableable.extension.st

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Extension { #name : #TToTripletElement }
2+
3+
{ #category : #'*Toplo-Serialization-Stash' }
4+
TToTripletElement >> stashAccessorsForTToTripletElement [
5+
6+
<stashAccessors>
7+
8+
| settersAndGetters |
9+
settersAndGetters := OrderedCollection new.
10+
11+
self endAlignment ifNotNil: [ settersAndGetters add: #endAlignment ].
12+
self endElement ifNotNil: [ settersAndGetters add: #endElement ].
13+
self endFlexible ifTrue: [ settersAndGetters add: #endFlexible ].
14+
self endInterspace = 0 ifFalse: [
15+
settersAndGetters add: #endInterspace ].
16+
17+
self flexible ifTrue: [ settersAndGetters add: #flexible ].
18+
self middleElement ifNotNil: [ settersAndGetters add: #middleElement ].
19+
20+
self startAlignment ifNotNil: [
21+
settersAndGetters add: #startAlignment ].
22+
self startElement ifNotNil: [ settersAndGetters add: #startElement ].
23+
self startFlexible ifTrue: [ settersAndGetters add: #startFlexible ].
24+
self startInterspace = 0 ifFalse: [
25+
settersAndGetters add: #startInterspace ].
26+
27+
^ settersAndGetters
28+
]

src/Toplo-Serialization-Stash/ToButton.extension.st

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/Toplo-Serialization-Tests/ToSerializerTest.class.st

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -368,42 +368,3 @@ ToSerializerTest >> testTokens [
368368
self assert: (element valueOfTokenNamed: #hello) value equals: #goodbye.
369369
self assert: (element valueOfTokenNamed: #titi) value equals: #toto ]
370370
]
371-
372-
{ #category : #tests }
373-
ToSerializerTest >> testTooltip1 [
374-
375-
| origin |
376-
origin := ToElement new.
377-
378-
self
379-
test: origin
380-
on: [ :element | self assert: element hasTooltip equals: false ]
381-
]
382-
383-
{ #category : #tests }
384-
ToSerializerTest >> testTooltip2 [
385-
386-
| origin |
387-
origin := ToElement new
388-
tooltipText: 'hello tooltip';
389-
closeTooltipWindowOnMouseLeave: false;
390-
yourself.
391-
392-
self test: origin on: [ :element |
393-
self assert: element hasTooltip.
394-
self deny: element closeTooltipWindowOnMouseLeave. ]
395-
]
396-
397-
{ #category : #tests }
398-
ToSerializerTest >> testTooltip3 [
399-
400-
| origin |
401-
origin := ToElement new
402-
tooltipText: 'hello tooltip';
403-
tooltipPopupDelay: 5;
404-
yourself.
405-
406-
self test: origin on: [ :element |
407-
self assert: element hasTooltip.
408-
self assert: element tooltipPopupDelay equals: 5 ]
409-
]

src/Toplo-Serialization/TToElementWithPlaceholder.extension.st

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)