Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Pyramid-Bloc/BlElementGeometry.extension.st
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BlElementGeometry class >> asIcon [

| element |
element := BlElement new
size: 16 @ 12;
extent: 16 @ 12;
background: (Color gray: 0.75);
border: (BlBorder paint: Color black width: 1);
geometry: self pyramidDefaultValueForIcon;
Expand Down
12 changes: 6 additions & 6 deletions src/Pyramid-Bloc/PyramidGeometryInputPresenter.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ PyramidGeometryInputPresenter >> initializeGeometryButtons [
help: 'Change the geometry to a rectangle.';
defaultGeometry: BlRectangleGeometry new;
blocIcon: (BlElement new
size: 16 asPoint;
extent: 16 asPoint;
geometry: BlRectangleGeometry new;
yourself);
yourself).
Expand All @@ -64,23 +64,23 @@ PyramidGeometryInputPresenter >> initializeGeometryButtons [
help: 'Change the geometry to an ellipse.';
defaultGeometry: BlEllipseGeometry new;
blocIcon: (BlElement new
size: 16 asPoint;
extent: 16 asPoint;
geometry: BlEllipseGeometry new;
yourself);
yourself).

geometryDictionary
at: BlRoundedRectangleGeometry
put: (PyramidGeometryInputModel new
input: self;
help: 'Change the geometry to an ellipse.';
defaultGeometry: (BlRoundedRectangleGeometry cornerRadius: 12);
blocIcon: (BlElement new
size: 16 asPoint;
extent: 16 asPoint;
geometry: (BlRoundedRectangleGeometry cornerRadius: 5);
yourself);
yourself).

geometryDictionary
at: BlPolygonGeometry
put: (PyramidGeometryInputModel new
Expand All @@ -93,7 +93,7 @@ PyramidGeometryInputPresenter >> initializeGeometryButtons [
(16 @ 6).
(3 @ 16) } * 3);
blocIcon: (BlElement new
size: 16 asPoint;
extent: 16 asPoint;
geometry: (BlPolygonGeometry vertices: {
(8 @ 0).
(13 @ 16).
Expand Down
6 changes: 3 additions & 3 deletions src/Pyramid-Bloc/PyramidLibraryElement.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PyramidLibraryElement >> asForm [

formElement := BlElement new
clipChildren: false;
size: 800 @ 600;
extent: 800 @ 600;
addChildren: self asArray;
background: Color white;
yourself.
Expand All @@ -39,13 +39,13 @@ PyramidLibraryElement >> asForm [
bottom: 0.
formElement childrenDo: [ :each |
bound merge: (each localBoundsToParent:
(BlBounds fromRectangle: each invalidationBounds)) ].
(BlBounds fromRectangle: each invalidationBounds)) ].
extent := bound extent.
possibleSizes := {
(50 @ 50).
(240 @ 240).
(480 @ 480) } select: [ :each | each >= extent ].
possibleSizes ifNotEmpty: [ formElement size: possibleSizes first ].
possibleSizes ifNotEmpty: [ formElement extent: possibleSizes first ].

^ formElement exportAsForm
]
Expand Down
27 changes: 15 additions & 12 deletions src/Pyramid-Bloc/PyramidMainExtension.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -243,20 +243,23 @@ PyramidMainExtension >> initialize [
workplacePropertiesView := PyramidWorkplacePropertiesPresenter new
workplaceSizeValue: self defaultExtent;
whenWorkplaceValuesChangedDo: [ :point |
self extent: point ];
self extent: point ];
whenVisibilityChangedDo: [
self switchGridvisibility.
self createGrid ];
self switchGridvisibility.
self createGrid ];
spacingTextValue: self defaultGridSpacing;
whenSpacingTextChangedDo: [ :value |
(self checkZeroOrSubZeroGridSpacingValue: value)
ifTrue: [ gridSpacing := self defaultGridSpacing ]
ifFalse: [ gridSpacing := value ].
self createGrid ];
whenSpacingTextChangedDo: [ :value |
(self
checkZeroOrSubZeroGridSpacingValue:
value)
ifTrue: [
gridSpacing := self defaultGridSpacing ]
ifFalse: [ gridSpacing := value ].
self createGrid ];
gridColorValue: self defaultGridColor;
whenColorValuesChangedDo: [ :color |
gridColor := color.
self createGrid ];
gridColor := color.
self createGrid ];
yourself.

"Button of the pop-up windows properties who call the creation of the pop-up"
Expand Down Expand Up @@ -310,7 +313,7 @@ PyramidMainExtension >> initialize [

sizeElement := BlElement new
id: #MainExtension_sizeElement;
size: self defaultExtent;
extent: self defaultExtent;
clipChildren: false;
addChildren: {
containerElement.
Expand All @@ -327,7 +330,7 @@ PyramidMainExtension >> installOn: aBuilder [
self elementAtTransforms transformDo: [ :t |
t translateBy: self offsetTranslation ].
self builder signalTransformationChanged.
self elementAtWidgets size: self defaultExtent
self elementAtWidgets extent: self defaultExtent
]

{ #category : #'as yet unclassified' }
Expand Down
147 changes: 0 additions & 147 deletions src/Pyramid-Bloc/PyramidSpaceShortcutCopyPasteCut.class.st

This file was deleted.

60 changes: 0 additions & 60 deletions src/Pyramid-Bloc/PyramidSpaceShortcutGrid.class.st

This file was deleted.

This file was deleted.

Loading
Loading