Skip to content

Commit 31698fd

Browse files
labordeplabordep
authored
Merge pull request #74 from OpenSmock/dev
Dev
2 parents cf8dead + 39db74f commit 31698fd

389 files changed

Lines changed: 18082 additions & 10139 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/BaselineOfPyramid/BaselineOfPyramid.class.st‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ BaselineOfPyramid >> baseline: spec [
1212
spec postLoadDoIt: #postload:package:.
1313
self dependencies: spec.
1414
spec
15-
package: #Pyramid with: [ spec requires: #( #BlocSerialization ) ];
15+
package: #Pyramid;
1616
package: #'Pyramid-Bloc'
17-
with: [ spec requires: #( #Pyramid #Bloc ) ];
18-
package: #'Pyramid-Tests' with: [ spec requires: #( #Pyramid ) ];
17+
with: [ spec requires: #( #Pyramid #Bloc #BlocSerialization) ];
18+
package: #'Pyramid-Tests' with: [ spec requires: #( #Pyramid #'Pyramid-Bloc' ) ];
19+
package: #'Pyramid-Examples'
20+
with: [ spec requires: #( #Pyramid ) ];
1921
package: #'Pyramid-IDE' with: [ spec requires: #( #Pyramid ) ] ]
2022
]
2123

‎src/Pyramid-Bloc/BlBackground.extension.st‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Extension { #name : #BlBackground }
2+
3+
{ #category : #'*Pyramid-Bloc' }
4+
BlBackground >> = aBlBackground [
5+
6+
aBlBackground == self ifTrue: [ ^ true ].
7+
^ aBlBackground class = self class
8+
]
9+
10+
{ #category : #'*Pyramid-Bloc' }
11+
BlBackground >> asForm [
12+
13+
^ self shouldBeImplemented
14+
]
15+
16+
{ #category : #'*Pyramid-Bloc' }
17+
BlBackground >> asString [
18+
19+
^ self shouldBeImplemented
20+
]
21+
22+
{ #category : #'*Pyramid-Bloc' }
23+
BlBackground >> selectOnBackgroundInput: aPyramidBackgroundInputPresenter [
24+
25+
self shouldBeImplemented
26+
]

‎src/Pyramid-Bloc/BlBasicLayout.extension.st‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Extension { #name : #BlBasicLayout }
2+
3+
{ #category : #'*Pyramid-Bloc' }
4+
BlBasicLayout >> setLayoutOn: aPyramidLayoutInputPresenter [
5+
6+
aPyramidLayoutInputPresenter setBasic
7+
]

‎src/Pyramid-Bloc/BlColorPaint.extension.st‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
Extension { #name : #BlColorPaint }
22

33
{ #category : #'*Pyramid-Bloc' }
4-
BlColorPaint >> pyramidBackgroundPreview [
4+
BlColorPaint >> asForm [
55

6-
^ PyramidPaintPreviewSolidColor new color: self color
6+
^ (Morph new
7+
extent: 16 @ 16;
8+
color: self color;
9+
yourself) asForm
710
]
811

912
{ #category : #'*Pyramid-Bloc' }
10-
BlColorPaint >> pyramidModalDefaultPaint: aPyramidPaintInput [
13+
BlColorPaint >> selectOnBackgroundInput: aPyramidBackgroundInputPresenter [
1114

12-
aPyramidPaintInput buttonColor click.
13-
aPyramidPaintInput inputSolid defaultColor: self color
15+
aPyramidBackgroundInputPresenter selectPaintSolidWith: self
1416
]

‎src/Pyramid-Bloc/BlCompositeBackground.extension.st‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Extension { #name : #BlCompositeBackground }
22

33
{ #category : #'*Pyramid-Bloc' }
4-
BlCompositeBackground >> pyramidBackgroundStrategy [
4+
BlCompositeBackground >> asForm [
55

6-
^ PyramidBackgroundPropertyInputUnknownStrategy new
6+
^ self iconNamed: #jigsawIcon
77
]
88

99
{ #category : #'*Pyramid-Bloc' }
10-
BlCompositeBackground >> pyramidSelectMenuOnModal: aModal [
10+
BlCompositeBackground >> asString [
1111

12-
aModal buttonComposite click
12+
^ 'Composite'
1313
]

‎src/Pyramid-Bloc/BlCornerRadii.extension.st‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Extension { #name : #BlCornerRadii }
2+
3+
{ #category : #'*Pyramid-Bloc' }
4+
BlCornerRadii >> setCornerRadiiOn: aPyramidInsetsInputPresenter [
5+
6+
((self topLeft closeTo: self bottomRight) and: [(self topRight closeTo: self bottomLeft)]) ifTrue: [
7+
(self topLeft closeTo: self topRight) ifTrue: [ aPyramidInsetsInputPresenter inputArray value: { self topLeft }. ] ifFalse: [ aPyramidInsetsInputPresenter inputArray value: { self topLeft . self topRight}. ].
8+
^ self ].
9+
10+
aPyramidInsetsInputPresenter inputArray value: {
11+
self topLeft . self topRight . self bottomRight . self bottomLeft }.
12+
13+
]

‎src/Pyramid-Bloc/BlElement.extension.st‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Extension { #name : #BlElement }
2+
3+
{ #category : #'*Pyramid-Bloc' }
4+
BlElement >> asIcon [
5+
6+
^ self iconNamed: #class
7+
]

‎src/Pyramid-Bloc/BlElementGeometry.extension.st‎

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

‎src/Pyramid-Bloc/BlEllipseGeometry.extension.st‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Extension { #name : #BlEllipseGeometry }
2+
3+
{ #category : #'*Pyramid-Bloc' }
4+
BlEllipseGeometry >> = anObject [
5+
6+
self == anObject ifTrue: [ ^ true ].
7+
^ self class = anObject class
8+
]

‎src/Pyramid-Bloc/BlFlowLayout.extension.st‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Extension { #name : #BlFlowLayout }
2+
3+
{ #category : #'*Pyramid-Bloc' }
4+
BlFlowLayout >> = anObject [
5+
6+
self == anObject ifTrue: [ ^ true ].
7+
self class = anObject class ifFalse: [ ^ false ].
8+
self orientation = anObject orientation ifFalse: [ ^ false ].
9+
self horizontalAlignment = anObject horizontalAlignment ifFalse: [ ^ false ].
10+
self verticalAlignment = anObject verticalAlignment ifFalse: [ ^ false ].
11+
^ true
12+
]
13+
14+
{ #category : #'*Pyramid-Bloc' }
15+
BlFlowLayout >> setLayoutOn: aPyramidLayoutInputPresenter [
16+
17+
aPyramidLayoutInputPresenter setFlow
18+
]

0 commit comments

Comments
 (0)