PenShape is now based on Geometry package

OpenSmock · Jan 24, 2020 · a83782d · a83782d
1 parent 451c728
commit a83782d
Show file tree

Hide file tree

Showing 23 changed files with 176 additions and 37 deletions.
diff --git a/src/BaselineOfPenfeld/BaselineOfPenfeld.class.st b/src/BaselineOfPenfeld/BaselineOfPenfeld.class.st
@@ -9,20 +9,10 @@ BaselineOfPenfeld >> baseline: spec [
 	<baseline>
 	spec
 		for: #common
-		do: [ "Bloc"
-			spec
-				baseline: 'Bloc'
-				with: [ spec repository: 'github://pharo-graphics/Bloc/src' ].
-
-			"Brick text editor"
-			spec
-				baseline: 'Brick'
-				with: [ spec repository: 'github://StevenCostiou/Brick/src'. ].
-
-			"PharoStylesheet"
-			spec
-				baseline: 'PharoStylesheet'
-				with: [ spec repository: 'github://GlennCavarle/PharoStylesheet/src' ].
+		do: [
+			self geometry: spec.
+			self stylesheet: spec.
+			self bloc: spec.
 
 			"Penfeld"
 			spec
@@ -36,3 +26,29 @@ BaselineOfPenfeld >> baseline: spec [
 				with: [ spec requires: 'Penfeld-Bloc' ].
 			spec package: 'Penfeld-Tests' with: [ spec requires: 'Penfeld' ] ]
 ]
+
+{ #category : #dependencies }
+BaselineOfPenfeld >> bloc: spec [
+	spec
+		baseline: 'Bloc'
+		with: [ spec repository: 'github://feenkcom/Bloc/src' ].
+
+	"Brick text editor"
+	spec
+		baseline: 'Brick'
+		with: [ spec repository: 'github://StevenCostiou/Brick/src'. ].
+]
+
+{ #category : #dependencies }
+BaselineOfPenfeld >> geometry: spec [
+	spec
+		baseline: 'Geometry'
+		with: [ spec repository: 'github://TelescopeSt/Geometry/src' ]
+]
+
+{ #category : #dependencies }
+BaselineOfPenfeld >> stylesheet: spec [
+	spec
+		baseline: 'PharoStylesheet'
+		with: [ spec repository: 'github://GlennCavarle/PharoStylesheet/src' ]
+]
diff --git a/src/Penfeld-Bloc-Tests/PenBlocShapeDresserTest.class.st b/src/Penfeld-Bloc-Tests/PenBlocShapeDresserTest.class.st
@@ -0,0 +1,33 @@
+"
+A PenBlocShapeDresserTest is a test class for testing the behavior of PenBlocShapeDresser
+"
+Class {
+	#name : #PenBlocShapeDresserTest,
+	#superclass : #TestCase,
+	#category : #'Penfeld-Bloc-Tests-Dressers'
+}
+
+{ #category : #'tests - build geometry' }
+PenBlocShapeDresserTest >> testBuildCircle [
+	PenShape new shape: (GCircle center: 100 , 100 radius: 30); build.
+]
+
+{ #category : #'tests - build geometry' }
+PenBlocShapeDresserTest >> testBuildEllipse [
+	PenShape new shape: (GEllipse center: 40 , 10 vertex: 60 , 10 coVertex: 40 , 20); build.
+]
+
+{ #category : #'tests - build geometry' }
+PenBlocShapeDresserTest >> testBuildPolygon [
+	PenShape new shape: (GPolygon vertices: {(10 , 10) . (-10 , 10) . (-10 , -10)}); build.
+]
+
+{ #category : #'tests - build geometry' }
+PenBlocShapeDresserTest >> testBuildRectangle [
+	PenShape new shape: (GRectangle origin: 1 , 3 corner: 3 , 0); build.
+]
+
+{ #category : #'tests - build geometry' }
+PenBlocShapeDresserTest >> testBuildTriangle [
+	PenShape new shape: (GTriangle with: 0 , 0 with: 2 , 0 with: 0 , 2); build.
+]
diff --git a/src/Penfeld-Bloc/GCircle.extension.st b/src/Penfeld-Bloc/GCircle.extension.st
@@ -0,0 +1,6 @@
+Extension { #name : #GCircle }
+
+{ #category : #'*Penfeld-Bloc' }
+GCircle >> asBlElement [
+	^ (BlCircle new extent: self extent) asElement
+]
diff --git a/src/Penfeld-Bloc/GEllipse.extension.st b/src/Penfeld-Bloc/GEllipse.extension.st
@@ -0,0 +1,6 @@
+Extension { #name : #GEllipse }
+
+{ #category : #'*Penfeld-Bloc' }
+GEllipse >> asBlElement [
+	^ (BlEllipse extent: self extent) asElement
+]
diff --git a/src/Penfeld-Bloc/GPolygon.extension.st b/src/Penfeld-Bloc/GPolygon.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #GPolygon }
+
+{ #category : #'*Penfeld-Bloc' }
+GPolygon >> asBlElement [
+	^ (BlPolygon new
+		vertices: (self vertices collect: [ :gpoint | gpoint x @ gpoint y ]))
+		asElement
+]
diff --git a/src/Penfeld-Bloc/GRectangle.extension.st b/src/Penfeld-Bloc/GRectangle.extension.st
@@ -0,0 +1,6 @@
+Extension { #name : #GRectangle }
+
+{ #category : #'*Penfeld-Bloc' }
+GRectangle >> asBlElement [
+	^ (BlRectangle new extent: self extent) asElement
+]
diff --git a/src/Penfeld-Bloc/GTriangle.extension.st b/src/Penfeld-Bloc/GTriangle.extension.st
@@ -0,0 +1,9 @@
+Extension { #name : #GTriangle }
+
+{ #category : #'*Penfeld-Bloc' }
+GTriangle >> asBlElement [
+	^ (BlPolygon new vertices: { 
+		self v1 x @ self v1 y.
+		self v2 x @ self v2 y.
+		self v3 x @ self v3 y. }) asElement
+]
diff --git a/src/Penfeld-Bloc/PenBlocButtonDresser.class.st b/src/Penfeld-Bloc/PenBlocButtonDresser.class.st
@@ -85,7 +85,7 @@ PenBlocButtonDresser >> initEngineElement [
 	self component engineElement preventChildrenMouseEvents.
 ]
 
-{ #category : #accessing }
+{ #category : #'accessing - font' }
 PenBlocButtonDresser >> ropedText [
 	^ ropedText
 ]

diff --git a/src/Penfeld-Bloc/PenBlocCheckBoxDresser.class.st b/src/Penfeld-Bloc/PenBlocCheckBoxDresser.class.st
@@ -119,7 +119,7 @@ PenBlocCheckBoxDresser >> initEngineElement [
 	self component engineElement when: BlMouseLeaveEvent do: [ :e | self whenMouseLeaveEvent ].
 ]
 
-{ #category : #accessing }
+{ #category : #'accessing - font' }
 PenBlocCheckBoxDresser >> ropedText [
 	^ ropedText
 ]

diff --git a/src/Penfeld-Bloc/PenBlocDressersMap.class.st b/src/Penfeld-Bloc/PenBlocDressersMap.class.st
@@ -26,5 +26,5 @@ PenBlocDressersMap >> initMap [
 		at: PenProgressBar put: PenBlocProgressBarDresser ;
 		at: PenSlider put: PenBlocSliderDresser;
 		at: PenImage put: PenBlocImageDresser;
-		at: PenShape put: PenBlocShapeExperimentalDresser 
+		at: PenShape put: PenBlocShapeDresser 
 ]
diff --git a/src/Penfeld-Bloc/PenBlocLabelDresser.class.st b/src/Penfeld-Bloc/PenBlocLabelDresser.class.st
@@ -43,7 +43,7 @@ PenBlocLabelDresser >> doBeforeApplyStyle [
 	ropedText := self component text asRopedText
 ]
 
-{ #category : #styling }
+{ #category : #'styling - font' }
 PenBlocLabelDresser >> fontSize: aValue [
 	self ropedText fontSize: aValue value.
 	self component engineElement constraintsDo: [ :c |
@@ -63,7 +63,7 @@ PenBlocLabelDresser >> initEngineElement [
 	element addChild: BlTextElement new as: #text.
 ]
 
-{ #category : #accessing }
+{ #category : #'accessing - font' }
 PenBlocLabelDresser >> ropedText [
 	^ ropedText
 ]

diff --git a/src/Penfeld-Bloc/PenBlocRadioButtonDresser.class.st b/src/Penfeld-Bloc/PenBlocRadioButtonDresser.class.st
@@ -118,7 +118,7 @@ PenBlocRadioButtonDresser >> initEngineElement [
 	self component engineElement when: BlMouseLeaveEvent do: [ :e | self whenMouseLeaveEvent ].
 ]
 
-{ #category : #accessing }
+{ #category : #'accessing - font' }
 PenBlocRadioButtonDresser >> ropedText [
 	^ ropedText
 ]

diff --git a/src/Penfeld-Bloc/PenBlocShapeDresser.class.st b/src/Penfeld-Bloc/PenBlocShapeDresser.class.st
@@ -0,0 +1,38 @@
+Class {
+	#name : #PenBlocShapeDresser,
+	#superclass : #PenBlocDresser,
+	#traits : 'TPenBlocSizeStyle + TPenBlocMarginStyle + TPenBlocBackgroundStyle + TPenBlocBorderStyle',
+	#classTraits : 'TPenBlocSizeStyle classTrait + TPenBlocMarginStyle classTrait + TPenBlocBackgroundStyle classTrait + TPenBlocBorderStyle classTrait',
+	#category : #'Penfeld-Bloc-Dressers'
+}
+
+{ #category : #dressing }
+PenBlocShapeDresser >> doAfterApplyStyle [ 
+	| var element |
+	element := self component engineElement.
+
+	"Position"
+	var := self component position.
+	var ifNotNil: [ element relocate: var ].
+
+	"Width"
+	var := self component width.
+	var ifNotNil: [ element width: var pref ].
+
+	"Height"
+	var := self component height.
+	var ifNotNil: [ element height: var pref ].
+]
+
+{ #category : #dressing }
+PenBlocShapeDresser >> initEngineElement [
+	| element |
+	element := self component shape asBlElement.
+	element
+		border: BlBorder empty;
+		background: BlBackground transparent.
+
+	self component hasEvents ifFalse: [ element preventMeAndChildrenMouseEvents ].
+
+	self component engineElement: element .
+]
diff --git a/src/Penfeld-Bloc/PenBlocShapeExperimentalDresser.class.st b/src/Penfeld-Bloc/PenBlocShapeExperimentalDresser.class.st
@@ -6,6 +6,12 @@ Class {
 	#category : #'Penfeld-Bloc-Dressers'
 }
 
+{ #category : #testing }
+PenBlocShapeExperimentalDresser class >> isDeprecated [
+	self flag: 'Use PenBlocShapeDresser and GShape instead'.
+	^ true
+]
+
 { #category : #dressing }
 PenBlocShapeExperimentalDresser >> doAfterApplyStyle [ 
 	| var element |

diff --git a/src/Penfeld-Bloc/PenBlocTableItemDresser.class.st b/src/Penfeld-Bloc/PenBlocTableItemDresser.class.st
@@ -20,7 +20,7 @@ PenBlocTableItemDresser >> doAfterApplyStyle [
 	].
 ]
 
-{ #category : #'accessing structure variables' }
+{ #category : #'styling - size' }
 PenBlocTableItemDresser >> height: aValue [
 	self component engineElement constraintsDo: [ :c |
 		c vertical exact: aValue ].

diff --git a/src/Penfeld-Bloc/TPenBlocBackgroundStyle.trait.st b/src/Penfeld-Bloc/TPenBlocBackgroundStyle.trait.st
@@ -3,12 +3,12 @@ Trait {
 	#category : #'Penfeld-Bloc-Styles'
 }
 
-{ #category : #styling }
+{ #category : #'styling - background' }
 TPenBlocBackgroundStyle >> backgroundColor: aValue [
 	self component engineElement background: aValue
 ]
 
-{ #category : #styling }
+{ #category : #'styling - background' }
 TPenBlocBackgroundStyle >> backgroundImage: aValue [
 	self component engineElement background: aValue
 ]

diff --git a/src/Penfeld-Bloc/TPenBlocBorderStyle.trait.st b/src/Penfeld-Bloc/TPenBlocBorderStyle.trait.st
@@ -3,7 +3,7 @@ Trait {
 	#category : #'Penfeld-Bloc-Styles'
 }
 
-{ #category : #styling }
+{ #category : #'styling - border' }
 TPenBlocBorderStyle >> border: aValue [
 	| borderBuilder |	
 	borderBuilder := BlBorderBuilder new.
@@ -44,7 +44,7 @@ TPenBlocBorderStyle >> border: aValue [
 	self component engineElement border: borderBuilder build.
 ]
 
-{ #category : #styling }
+{ #category : #'styling - border' }
 TPenBlocBorderStyle >> borderRadius: aValue [
 	| radius |
 	aValue class = PssPercentValue 

diff --git a/src/Penfeld-Bloc/TPenBlocFontStyle.trait.st b/src/Penfeld-Bloc/TPenBlocFontStyle.trait.st
@@ -3,38 +3,38 @@ Trait {
 	#category : #'Penfeld-Bloc-Styles'
 }
 
-{ #category : #styling }
+{ #category : #'styling - font' }
 TPenBlocFontStyle >> color: aValue [
 	self ropedText foreground: aValue
 ]
 
-{ #category : #styling }
+{ #category : #'styling - font' }
 TPenBlocFontStyle >> fontFamily: aValue [
 	self ropedText fontName: aValue value.
 ]
 
-{ #category : #styling }
+{ #category : #'styling - font' }
 TPenBlocFontStyle >> fontSize: aValue [
 	self ropedText fontSize: aValue value
 ]
 
-{ #category : #styling }
+{ #category : #'styling - font' }
 TPenBlocFontStyle >> fontStyle: aValue [
 	| symbol |
 	symbol := aValue value.
 	(self ropedText respondsTo: symbol)
 		ifTrue: [ self ropedText perform: symbol ]
 ]
 
-{ #category : #styling }
+{ #category : #'styling - font' }
 TPenBlocFontStyle >> fontWeight: aValue [
 	| symbol |
 	symbol := aValue value.
 	(self ropedText respondsTo: symbol)
 		ifTrue: [ self ropedText perform: symbol ]
 ]
 
-{ #category : #accessing }
+{ #category : #'accessing - font' }
 TPenBlocFontStyle >> ropedText [
 	self explicitRequirement
 ]
diff --git a/src/Penfeld-Bloc/TPenBlocMarginStyle.trait.st b/src/Penfeld-Bloc/TPenBlocMarginStyle.trait.st
@@ -3,7 +3,7 @@ Trait {
 	#category : #'Penfeld-Bloc-Styles'
 }
 
-{ #category : #accessing }
+{ #category : #'styling - margin' }
 TPenBlocMarginStyle >> margin: aValue [
 	| insets array |
 	aValue isArray

diff --git a/src/Penfeld-Bloc/TPenBlocSizeStyle.trait.st b/src/Penfeld-Bloc/TPenBlocSizeStyle.trait.st
@@ -3,13 +3,13 @@ Trait {
 	#category : #'Penfeld-Bloc-Styles'
 }
 
-{ #category : #'accessing structure variables' }
+{ #category : #'styling - size' }
 TPenBlocSizeStyle >> height: aValue [
 	self component engineElement constraintsDo: [ :c |
 		c vertical exact: aValue ] 
 ]
 
-{ #category : #'accessing structure variables' }
+{ #category : #'styling - size' }
 TPenBlocSizeStyle >> width: aValue [
 	self component engineElement constraintsDo: [ :c |
 		c horizontal exact: aValue ] 

diff --git a/src/Penfeld-Brick-TextEditor/PenBlocInputDresser.class.st b/src/Penfeld-Brick-TextEditor/PenBlocInputDresser.class.st
@@ -59,7 +59,7 @@ PenBlocInputDresser >> initEngineElement [
 		do: [ :e | self component text: dataSource text copy ].
 ]
 
-{ #category : #accessing }
+{ #category : #'accessing - font' }
 PenBlocInputDresser >> ropedText [
 	^ ropedText
 ]