Made #drawFormSet:at: and #translucentFormSet:at: on ScalingCanvas use the Form at the corresponding scale from the FormSet (unless the scale is 2 and the scale 1 Form is mapped in the FormMapping).

Rinzwind · Rinzwind · commit a7e272b02bb3 · 2023-10-13T23:22:37.000+02:00
diff --git a/src/Graphics-Canvas/ScalingCanvas.class.st b/src/Graphics-Canvas/ScalingCanvas.class.st
@@ -109,7 +109,7 @@ ScalingCanvas class >> exampleFrameAndFillRectangle2 [
 ]
 
 { #category : 'examples' }
-ScalingCanvas class >> exampleImageMorph [
+ScalingCanvas class >> exampleImageMorph1 [
 
 	^ self privateExampleWithMorph: (Morph new
 		color: Color veryVeryLightGray;
@@ -123,6 +123,34 @@ ScalingCanvas class >> exampleImageMorph [
 		yourself)
 ]
 
+{ #category : 'examples' }
+ScalingCanvas class >> exampleImageMorph2 [
+
+	| forms imageMorph |
+	
+	forms := (1 to: 2) collect: [ :scale |
+		(FormCanvas extent: 100 asPoint * scale depth: 1)
+			fillOval: ((0 asPoint extent: 100 asPoint * scale) insetBy: 5 * scale) fillStyle: Color green;
+			form ].
+	(imageMorph := ImageMorph withFormSet: (FormSet forms: forms))
+		color: Color blue.
+	^ self privateExampleWithMorph: imageMorph
+]
+
+{ #category : 'examples' }
+ScalingCanvas class >> exampleImageMorph3 [
+
+	| forms imageMorph |
+	
+	forms := (1 to: 2) collect: [ :scale |
+		(FormCanvas extent: 10 asPoint * scale)
+			fillOval: ((0 asPoint extent: 10 asPoint * scale) insetBy: 1 * scale) fillStyle: Color black;
+			form ].
+	(imageMorph := ImageMorph withFormSet: (FormSet forms: forms))
+		resize: 200@100.
+	^ self privateExampleWithMorph: imageMorph
+]
+
 { #category : 'examples' }
 ScalingCanvas class >> exampleLine1 [
 
@@ -282,6 +310,18 @@ ScalingCanvas >> depth [
 	^ formCanvas depth
 ]
 
+{ #category : 'drawing - images' }
+ScalingCanvas >> drawFormSet: formSet at: point [
+
+	| form scaledForm |
+
+	form := formSet asForm.
+	scaledForm := (scale = 2 and: [ FormMapping includesKey: form ])
+		ifTrue: [ FormMapping at: form ]
+		ifFalse: [ formSet asFormAtScale: scale ].
+	formCanvas drawImage: scaledForm at: point * scale
+]
+
 { #category : 'drawing - polygons' }
 ScalingCanvas >> drawPolygon: vertices color: aColor borderWidth: bw borderColor: bc [
 
@@ -499,3 +539,15 @@ ScalingCanvas >> translateBy: delta during: aBlock [
 	formCanvas translateBy: delta * scale during: [ :transformedFormCanvas |
 		aBlock value: (self class formCanvas: transformedFormCanvas scale: scale) ]
 ]
+
+{ #category : 'drawing - images' }
+ScalingCanvas >> translucentFormSet: formSet at: point [
+
+	| form scaledForm |
+
+	form := formSet asForm.
+	scaledForm := (scale = 2 and: [ FormMapping includesKey: form ])
+		ifTrue: [ FormMapping at: form ]
+		ifFalse: [ formSet asFormAtScale: scale ].
+	formCanvas translucentImage: scaledForm at: point * scale
+]
