Merge pull request #235 from Ducasse/dev-1.0

Resolving merge conflicts + massive cleaning
pharo-graphics · Apr 9, 2023 · f7de4b8 · f7de4b8
2 parents c3bbdcb + b8ca6c7
commit f7de4b8
Show file tree

Hide file tree

Showing 43 changed files with 505 additions and 850 deletions.
diff --git a/src/Bloc-Alexandrie-Tests/BlSpaceFixture.class.st b/src/Bloc-Alexandrie-Tests/BlSpaceFixture.class.st
diff --git a/src/Bloc-DevTool/BlDevCrossover.class.st b/src/Bloc-DevTool/BlDevCrossover.class.st
@@ -71,8 +71,8 @@ BlDevCrossover >> initialize [
 
 { #category : #'api - hooks' }
 BlDevCrossover >> mouseMoveEvent: anEvent [
-	verticalLine position: anEvent localPosition x @ 0.
-	horizontalLine position: 0 @ anEvent localPosition y.
+	verticalLine relocate: anEvent localPosition x @ 0.
+	horizontalLine relocate: 0 @ anEvent localPosition y.
 
 	topRightContainer constraintsDo: [ :c |
 		c frame horizontal weight: 1 - (anEvent localPosition x / (crossover width max: 1)).

diff --git a/src/Bloc-DevTool/BlElementSelection.class.st b/src/Bloc-DevTool/BlElementSelection.class.st
@@ -72,7 +72,7 @@ BlElementSelection >> hasInformation [
 BlElementSelection >> hideInfo [
 
 	self padding: BlInsets empty.
-	self position: self selectionPosition.
+	self relocate: self selectionPosition.
 	self size: self selectionExtent.
 
 	self effect: BlNullEffect new.

diff --git a/src/Bloc-Docs/BlGridLayoutUsageExamples.class.st b/src/Bloc-Docs/BlGridLayoutUsageExamples.class.st
@@ -42,7 +42,7 @@ BlGridLayoutUsageExamples >> exampleDistributed2x2Grid [
 	el := BlElement new
 		layout: (BlGridLayout new columnCount: 2);
 		size: 300@300;
-		position: 200 @ 100;
+		relocate: 200 @ 100;
 		background: Color blue;
 		addChildren: { e1. e2. e3. e4 };
 		yourself.
@@ -78,7 +78,7 @@ BlGridLayoutUsageExamples >> exampleDistributedWithSpan2x2Grid [
 	el := BlElement new
 		layout: (BlGridLayout new columnCount: 2);
 		size: 300@300;
-		position: 200 @ 100;
+		relocate: 200 @ 100;
 		background: Color blue;
 		addChildren: { e1. e2. e3 };
 		yourself.
@@ -119,7 +119,7 @@ BlGridLayoutUsageExamples >> exampleDistributedWithWeight2x2Grid [
 	el := BlElement new
 		layout: (BlGridLayout new columnCount: 2);
 		size: 300@300;
-		position: 200 @ 100;
+		relocate: 200 @ 100;
 		background: Color blue;
 		addChildren: { e1. e2. e3. e4 };
 		yourself.
@@ -142,7 +142,7 @@ BlGridLayoutUsageExamples >> exampleHorizontal2x1Grid [
 	el := BlElement new
 		layout: BlGridLayout horizontal;
 		size: 400@400;
-		position: 200 @ 100;
+		relocate: 200 @ 100;
 		background: Color blue;
 		addChildren: { e1. e2 };
 		yourself.
@@ -169,7 +169,7 @@ BlGridLayoutUsageExamples >> exampleHorizontalSpacing2x1Grid [
 	el := BlElement new
 		layout: (BlGridLayout horizontal cellSpacing: 20);
 		size: 400@200;
-		position: 200 @ 100;
+		relocate: 200 @ 100;
 		background: Color blue;
 		addChildren: { e1. e2 };
 		yourself.
@@ -206,7 +206,7 @@ BlGridLayoutUsageExamples >> exampleInCellAlignment2x2Grid [
 	el := BlElement new
 		layout: (BlGridLayout new columnCount: 2);
 		size: 300@300;
-		position: 200 @ 100;
+		relocate: 200 @ 100;
 		background: Color blue;
 		addChildren: { e1. e2. e3 };
 		yourself.
@@ -282,7 +282,7 @@ BlGridLayoutUsageExamples >> exampleSimple2x2Grid [
 	el := BlElement new
 		layout: (BlGridLayout new columnCount: 2);
 		size: 400@400;
-		position: 200 @ 100;
+		relocate: 200 @ 100;
 		background: Color blue;
 		addChildren: { e1. e2. e3. e4 };
 		yourself.
@@ -310,7 +310,7 @@ BlGridLayoutUsageExamples >> exampleSpacing9x9Grid [
 		constraintsDo: [ :c |
 			c horizontal exact: 400.
 			c vertical exact: 400 ];
-		position: 0 @ 0;
+		relocate: 0 @ 0;
 		background: Color blue;
 		addChildren: children;
 		yourself.
@@ -333,7 +333,7 @@ BlGridLayoutUsageExamples >> exampleVertical1x2Grid [
 	el := BlElement new
 		layout: BlGridLayout vertical;
 		size: 400@400;
-		position: 200 @ 100;
+		relocate: 200 @ 100;
 		background: Color blue;
 		addChildren: { e1. e2 };
 		yourself.
@@ -360,7 +360,7 @@ BlGridLayoutUsageExamples >> exampleVerticalSpacing1x2Grid [
 	el := BlElement new
 		layout: (BlGridLayout vertical cellSpacing: 20);
 		size: 200@400;
-		position: 200 @ 100;
+		relocate: 200 @ 100;
 		background: Color blue;
 		addChildren: { e1. e2 };
 		yourself.

diff --git a/src/Bloc-Docs/BlMouseOverOutAndEnterLeaveEventExplanation.class.st b/src/Bloc-Docs/BlMouseOverOutAndEnterLeaveEventExplanation.class.st
@@ -79,13 +79,13 @@ BlMouseOverOutAndEnterLeaveEventExplanation >> elementWithChildren [
 	aChildA := BlElement new
 		background: Color white;
 		effect: self shadow;
-		position: 30@50;
+		relocate: 30@50;
 		size: 100@100.
 
 	aChildB := BlElement new
 		background: Color white;
 		effect: self shadow;
-		position: 170@50;
+		relocate: 170@50;
 		size: 100@100.
 
 	aContainer addChild: aChildA as: #left.
@@ -102,7 +102,7 @@ BlMouseOverOutAndEnterLeaveEventExplanation >> elementWithoutChildren [
 	aContainer := BlElement new
 		background: Color white;
 		effect: self shadow;
-		position: 50@50;
+		relocate: 50@50;
 		size: 300@200.
 
 	^ aContainer

diff --git a/src/Bloc-Examples/BlBackgroundTest.class.st b/src/Bloc-Examples/BlBackgroundTest.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #BlBackgroundTest,
-	#superclass : #BlExamplesTest,
+	#superclass : #TestCase,
 	#category : #'Bloc-Examples-DocumentationExamples'
 }
 

diff --git a/src/Bloc-Examples/BlElementBoundsByScripterExamples.class.st b/src/Bloc-Examples/BlElementBoundsByScripterExamples.class.st
@@ -101,7 +101,7 @@ BlElementBoundsByScripterExamples >> bounds_in_space_element_2 [
 	^ BlElement new
 		id: #parent_2;
 		size: self bounds_in_space_element_extent;
-		position: 50@50;
+		relocate: 50@50;
 		border: (BlBorder paint: (Color red alpha: 0.2) width: 2)
 ]