EMCC: preload font to ensure correct text measurement

chrisws · chrisws · commit c7a7e5a5e993 · 2022-04-07T20:31:28.000+10:00
diff --git a/src/platform/emcc/canvas.cpp b/src/platform/emcc/canvas.cpp
@@ -179,7 +179,7 @@ Font::Font(int size, bool bold, bool italic) :
   if (bold) {
     _face.append("bold ");
   }
-  _face.append(size).append("px 'Inconsolata', monospace");
+  _face.append(size).append("px Inconsolata, monospace");
 }
 
 Font::~Font() {
diff --git a/src/platform/emcc/shell.html b/src/platform/emcc/shell.html
@@ -6,7 +6,7 @@
     <title>SmallBASIC</title>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Inconsolata&display=swap" rel="stylesheet">
+    <link rel="preload" as="font" href="https://fonts.googleapis.com/css2?family=Inconsolata&display=swap">
     <style>
       body {
         margin: 0px;

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ Font::Font(int size, bool bold, bool italic) :`
`179`	`179`	`if (bold) {`
`180`	`180`	`_face.append("bold ");`
`181`	`181`	`}`
`182`		`- _face.append(size).append("px 'Inconsolata', monospace");`
	`182`	`+ _face.append(size).append("px Inconsolata, monospace");`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`Font::~Font() {`