From 37b663796975a42e3aeba3c0bf6a3ebb6464fa7a Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Tue, 15 Nov 2022 08:58:49 +0000
Subject: [PATCH] tweaks as per
 https://github.com/espruino/BangleApps/pull/2272#issuecomment-1314987512

---
 apps/slopeclock/app.js   | 6 ++----
 apps/slopeclockpp/app.js | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/apps/slopeclock/app.js b/apps/slopeclock/app.js
index a71396cc1..178084fb0 100644
--- a/apps/slopeclock/app.js
+++ b/apps/slopeclock/app.js
@@ -42,13 +42,13 @@ let draw = function() {
   // Draw hour
   g.reset().clearRect(R); // clear whole background (w/o widgets)
   g.setFontAlign(-1, 0).setFont("PaytoneOne");
-  g.drawString(hourStr, fontBorder, y-offsy);
+  g.drawString(hourStr, fontBorder, y-offsy).setFont("4x6"); // draw and unload custom font
   // add slope in background color
   g.setColor(g.theme.bg).fillPoly([0,y+slope-slopeBorderUpper, R.w,y-slope-slopeBorderUpper,
                                    R.w,y-slope, 0,y+slope]);
   // Draw minute to offscreen buffer
   g2.setColor(0).fillRect(0,0,g2.getWidth(),g2.getHeight()).setFontAlign(1, 0).setFont("PaytoneOne");
-  g2.setColor(1).drawString(minStr, g2.getWidth()-fontBorder, g2.getHeight()/2);
+  g2.setColor(1).drawString(minStr, g2.getWidth()-fontBorder, g2.getHeight()/2).setFont("4x6"); // draw and unload custom font
   g2.setColor(0).fillPoly([0,0, g2.getWidth(),0, 0,slope*2]);
   // start the animation *in*
   animate(true);
@@ -107,8 +107,6 @@ Bangle.setUI({
     animInterval = undefined;
     if (drawTimeout) clearTimeout(drawTimeout);
     drawTimeout = undefined;
-    // Remove the loaded font if app is changed during animation
-    g.reset();
     delete Graphics.prototype.setFontPaytoneOne;
   }});
 // Load widgets
diff --git a/apps/slopeclockpp/app.js b/apps/slopeclockpp/app.js
index 17b893541..3dc4aad68 100644
--- a/apps/slopeclockpp/app.js
+++ b/apps/slopeclockpp/app.js
@@ -57,14 +57,14 @@ let draw = function() {
   // Draw hour
   g.reset().clearRect(R); // clear whole background (w/o widgets)
   g.setFontAlign(-1, 0).setFont("PaytoneOne");
-  g.drawString(hourStr, fontBorder, y-offsy);
+  g.drawString(hourStr, fontBorder, y-offsy).setFont("4x6"); // draw and unload custom font
   // add slope in background color
   g.setColor(g.theme.bg).fillPoly([0,y+slope-slopeBorderUpper, R.w,y-slope-slopeBorderUpper,
                                    R.w,y-slope, 0,y+slope]);
 
   // Draw minute to offscreen buffer
   g2.setColor(0).fillRect(0,0,g2.getWidth(),g2.getHeight()).setFontAlign(1, 0).setFont("PaytoneOne");
-  g2.setColor(1).drawString(minStr, g2.getWidth()-fontBorder, g2.getHeight()/2);
+  g2.setColor(1).drawString(minStr, g2.getWidth()-fontBorder, g2.getHeight()/2).setFont("4x6"); // draw and unload custom font
   g2.setColor(0).fillPoly([0,0, g2.getWidth(),0, 0,slope*2]);
   // start the animation *in*
   animate(true);
@@ -230,8 +230,6 @@ Bangle.setUI({
     animInterval = undefined;
     if (drawTimeout) clearTimeout(drawTimeout);
     drawTimeout = undefined;
-    // Remove the loaded font if app is changed during animation
-    g.reset();
     delete Graphics.prototype.setFontPaytoneOne;
   }});
 // Load widgets