Use in Cairo the same default font name as in Skia

pharo-graphics · Sep 17, 2021 · cd7a6ab · cd7a6ab
1 parent 9117933
commit cd7a6ab
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/src/Sparta-Cairo/SpartaCairoFreetypeFontBuilder.class.st b/src/Sparta-Cairo/SpartaCairoFreetypeFontBuilder.class.st
@@ -12,7 +12,7 @@ SpartaCairoFreetypeFontBuilder >> build [
 	| aFamilyName theFallbackFonts aLogicalFont |
 
 	aFamilyName := (fontList isNil or: [ fontList isEmpty ])
-		ifTrue: [ StandardFonts defaultFont familyName ]
+		ifTrue: [ self defaultName ]
 		ifFalse: [ fontList first ].
 
 	theFallbackFonts := fontList ifNotNil: [

diff --git a/src/Sparta-Core/FFIExternalResourceManager.extension.st b/src/Sparta-Core/FFIExternalResourceManager.extension.st
@@ -1,13 +1,13 @@
 Extension { #name : #FFIExternalResourceManager }
 
 { #category : #'*Sparta-Core' }
-FFIExternalResourceManager >> removeResource: oldObject [
-	registry remove: oldObject ifAbsent: [ ]
+FFIExternalResourceManager class >> removeResource: oldObject [
+	self uniqueInstance removeResource: oldObject
 ]
 
 { #category : #'*Sparta-Core' }
-FFIExternalResourceManager class >> removeResource: oldObject [
-	self uniqueInstance removeResource: oldObject
+FFIExternalResourceManager >> removeResource: oldObject [
+	registry remove: oldObject ifAbsent: [ ]
 ]
 
 { #category : #'*Sparta-Core' }

diff --git a/src/Sparta-Core/SpartaFontBuilder.class.st b/src/Sparta-Core/SpartaFontBuilder.class.st
@@ -76,6 +76,12 @@ SpartaFontBuilder >> defaultLanguage [
 	^ 'en'
 ]
 
+{ #category : #initialization }
+SpartaFontBuilder >> defaultName [
+
+	^ 'Helvetica'
+]
+
 { #category : #initialization }
 SpartaFontBuilder >> defaultSize [
 	^ 14

diff --git a/src/Sparta-Skia/SkiaFontBuilder.class.st b/src/Sparta-Skia/SkiaFontBuilder.class.st
@@ -42,7 +42,7 @@ SkiaFontBuilder >> build [
 	| aSpartaFontFace theFontsDictionary |
 
 	aSpartaFontFace := SpartaFontFace new
-		familyName: (familyName ifNil: [ 'Helvetica' ]);
+		familyName: (familyName ifNil: [ self defaultName ]);
 		weight: weight;
 		stretch: stretch;
 		style: style.