Applied changes from pull request #16479 (“Add setting to set the world renderer canvas scale factor automatically”) to Pharo 11.

Author: Rinzwind

src/OSWindow-Core/OSNullFormRenderer.class.st

@@ -11,6 +11,12 @@ Class {
 OSNullFormRenderer >> newExtent: anExtent [
 ]
 
+{ #category : #accessing }
+OSNullFormRenderer >> outputExtent [
+
+	^ 0@0
+]
+
 { #category : #'updating screen' }
 OSNullFormRenderer >> updateAll [
 	"Do nothing"

src/OSWindow-Core/OSWindowFormRenderer.class.st

@@ -60,6 +60,12 @@ OSWindowFormRenderer >> newExtent: newExtent [
 	form setExtent: newExtent depth: form depth
 ]
 
+{ #category : #accessing }
+OSWindowFormRenderer >> outputExtent [
+
+	self subclassResponsibility
+]
+
 { #category : #accessing }
 OSWindowFormRenderer >> pixelExtent [
 	^ form ifNotNil: [ form extent ] ifNil: [ 1@1 ]

src/OSWindow-Core/OSWorldRenderer.class.st

@@ -12,11 +12,24 @@ Class {
 		'previousFrameRenderingTime'
 	],
 	#classInstVars : [
-		'canvasScaleFactor'
+		'canvasScaleFactor',
+		'autoSetCanvasScaleFactor'
 	],
 	#category : #'OSWindow-Core-Morphic'
 }
 
+{ #category : #accessing }
+OSWorldRenderer class >> autoSetCanvasScaleFactor [
+
+	^ autoSetCanvasScaleFactor ifNil: [ autoSetCanvasScaleFactor := false ]
+]
+
+{ #category : #accessing }
+OSWorldRenderer class >> autoSetCanvasScaleFactor: boolean [
+
+	autoSetCanvasScaleFactor := boolean
+]
+
 { #category : #accessing }
 OSWorldRenderer class >> canvasScaleFactor [
 
@@ -52,12 +65,19 @@ OSWorldRenderer class >> settingsOn: aBuilder [
 
 	<systemsettings>
 
-	(aBuilder pickOne: #canvasScaleFactor)
+	(aBuilder group: #canvasScaleFactorGroup)
 		parent: #appearance;
-		label: 'Canvas scale factor for OSWorldRenderer';
-		target: self;
-		domainValues: (1 to: 5);
-		default: 1
+		label: 'World renderer canvas scaling';
+		with: [
+			(aBuilder pickOne: #canvasScaleFactor)
+				label: 'Canvas scale factor';
+				target: self;
+				domainValues: (1 to: 5);
+				default: 1.
+			(aBuilder setting: #autoSetCanvasScaleFactor)
+				label: 'Set canvas scale factor automatically';
+				target: self;
+				default: false ]
 ]
 
 { #category : #accessing }
@@ -97,6 +117,9 @@ OSWorldRenderer >> checkForNewScreenSize [
 	windowRenderer := self osWindowRenderer.
 	windowRenderer ifNil: [ ^ self ].
 
+	(world == World and: [ self class autoSetCanvasScaleFactor ]) ifTrue: [
+		self class canvasScaleFactor: (windowRenderer outputExtent / self windowExtent) min * self screenScaleFactor ].
+
 	(display isNil or: [ display extent = self actualDisplaySize and: [ world worldState realWindowExtent = self actualScreenSize ] ])
 		ifTrue: [ ^ self ].
 

src/OSWindow-SDL2/OSSDL2FormRenderer.class.st

@@ -69,6 +69,12 @@ OSSDL2FormRenderer >> initialize [
 	mutex := Mutex new
 ]
 
+{ #category : #accessing }
+OSSDL2FormRenderer >> outputExtent [
+
+	^ renderer outputExtent
+]
+
 { #category : #private }
 OSSDL2FormRenderer >> primitiveUpdateRectangle: rectangle externalForm: externalForm [