More realistic fonts.

ltgcgo · Jun 20, 2024 · d182809 · d182809
1 parent d561e4a
commit d182809
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/src/disp/disp_mu.mjs b/src/disp/disp_mu.mjs
@@ -399,7 +399,8 @@ let MuDisplay = class extends RootDisplay {
 			ctx.fillRect(16 + (pX + Math.floor(pX / 5)) * mprWidth, 12 + pY * mprWidth, mpaWidth, mpaWidth);
 		};
 		ctx.textAlign = "center";
-		ctx.font = '12px "Arial Web"';
+		ctx.font = '400 12px "Public Sans"';
+		ctx.textRendering = "geometricPrecision";
 		// Display parts under strengths
 		{
 			let initOff = 71.5;
@@ -435,7 +436,7 @@ let MuDisplay = class extends RootDisplay {
 		ctx.fillText("LSB", 564, 162.5);
 		ctx.fillStyle = !rendMode ? activePixel : inactivePixel;
 		ctx.fillText("BANK", 467.5, 162.5);
-		ctx.fillText("PGM#", 660, 162.5);
+		ctx.fillText("PGM♯", 660, 162.5);
 		ctx.fillStyle = !showLsb && rendMode ? activePixel : inactivePixel;
 		ctx.fillText("MSB", 131, 162.5);
 		ctx.fillStyle = showLsb && rendMode ? activePixel : inactivePixel;

diff --git a/src/disp/disp_n5.mjs b/src/disp/disp_n5.mjs
@@ -386,7 +386,7 @@ let Ns5rDisplay = class extends RootDisplay {
 			ctx.fillStyle = this.#backlight.replace("64", "");
 			ctx.fillRect(0, 0, ctx.canvas.width, ctx.canvas.height);
 			ctx.textAlign = "center";
-			ctx.font = '11px "Arial Web"';
+			ctx.font = '11px "Jost"';
 			ctx.fillStyle = "#000e";
 			ctx.fillText("MIDI. CH", 58, 10);
 			ctx.fillText("VOL", 153.5 + (+trueMode * 12), 10);

diff --git a/src/disp/disp_sc.mjs b/src/disp/disp_sc.mjs
@@ -105,14 +105,15 @@ let ScDisplay = class extends RootDisplay {
 		let scConf = upThis.device.modelEx.sc;
 		upThis.#nmdb.fill(0);
 		// Fill with orange
-		if (upThis.#countBg < 4 && timeNow - upThis.#lastBg >= 4000) {
+		if (upThis.#countBg < 10 && timeNow - upThis.#lastBg >= 1000) {
 			ctx.fillStyle = bgOrange.slice(0, 7);
 			ctx.fillRect(0, 0, ctx.canvas.width, ctx.canvas.height);
 			upThis.#lastBg = timeNow;
 			// Show text
 			ctx.fillStyle = "#000";
 			ctx.textAlign = "left";
-			ctx.font = '16px "Arial Web"';
+			ctx.font = '600 16px "Nunito Sans"';
+			ctx.textRendering = "geometricPrecision";
 			ctx.fillText("PART", 21, 20);
 			ctx.fillText("INSTRUMENT", 154, 20);
 			ctx.fillText("LEVEL", 21, 91);

diff --git a/test/css/fonts.css b/test/css/fonts.css
@@ -24,3 +24,18 @@
 	font-weight: 700;
 	src: url("../font/PTSansNarrow_b.woff2") format("woff2");
 }
+@font-face {
+	font-family: "Public Sans";
+	font-display: swap;
+	src: url("../font/PublicSans.woff2") format("woff2");
+}
+@font-face {
+	font-family: "Nunito Sans";
+	font-display: swap;
+	src: local("Numito Sans"), url("../font/NunitoSans.woff2") format("woff2");
+}
+@font-face {
+	font-family: "Jost";
+	font-display: swap;
+	src: local("Jost"), url("../font/Jost.woff2") format("woff2");
+}