From fd4461b51e65e3ab5201c1658efb087fd7209181 Mon Sep 17 00:00:00 2001
From: The Dod <nimrodkerrett@gmail.com>
Date: Thu, 27 Jan 2022 18:05:08 +0200
Subject: [PATCH] Avoid erasing bottom widgets

Turns out bottom widgets (specifically, digital clock widget)
were disappearing during maze generation. Still not clear _why_,
but calling `Bangle.drawWidgets()` from inside the `Maze` object
constructor solves this.

Also: say "Btn1" in order to be less confusing on `bangle.js 1`
(before I ask people to test this app on that platform).
---
 apps/acmaze/ChangeLog     |  1 +
 apps/acmaze/app.js        | 22 +++++++---------------
 apps/acmaze/metadata.json |  2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/apps/acmaze/ChangeLog b/apps/acmaze/ChangeLog
index 88e918a27..b8c1ec0b5 100644
--- a/apps/acmaze/ChangeLog
+++ b/apps/acmaze/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Faster maze generation
+0.03: Avoid clearing bottom widgets
diff --git a/apps/acmaze/app.js b/apps/acmaze/app.js
index 3f8a6d820..16a1ce561 100644
--- a/apps/acmaze/app.js
+++ b/apps/acmaze/app.js
@@ -11,13 +11,10 @@ function Maze(n) {
   this.margin = Math.floor((g.getHeight()-this.total_length)/2);
   this.ball_x = 0;
   this.ball_y = 0;
-  this.clearScreen = function() {
-    g.clearRect(
-      0, this.margin,
-      g.getWidth(), this.margin+this.total_length
-    );
-  };
-  this.clearScreen();
+  // This voodoo is needed because otherwise
+  // bottom line widgets (like digital clock)
+  // disappear during maze generation
+  Bangle.drawWidgets();
   g.setColor(g.theme.fg);
   for (let i=0; i<=n; i++) {
     g.drawRect(
@@ -66,7 +63,7 @@ function Maze(n) {
       if (Math.random()<0.5 && candidates_down.length || !candidates_right.length) {
         trying_down = true;
       }
-      let candidates = trying_down ? candidates_down : candidates_right;
+      let candidates = trying_down ? candidates_down : candidates_right,
           candidate_index = Math.floor(Math.random()*candidates.length),
           cell = candidates.splice(candidate_index, 1)[0],
           r = Math.floor(cell/n),
@@ -105,11 +102,6 @@ function Maze(n) {
       }
     }
   }
-  this.clearScreen = function() {
-    g.clearRect(
-      0, MARGIN, g.getWidth(), g.getHeight()-MARGIN-1
-    );
-  };
   this.clearCell = function(r, c) {
     if (!r && !c) {
       g.setColor("#ffff00");
@@ -263,7 +255,7 @@ let mazeMenu = {
   "< Exit": function() { setTimeout(load, 100); } // timeout voodoo prevents deadlock
 };
 
-g.clear(true);
+g.reset();
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 Bangle.setLocked(false);
@@ -289,7 +281,7 @@ let maze_interval = setInterval(
         duration = Date.now()-start_time;
         g.setFontAlign(0,0).setColor(g.theme.fg);
         g.setFont("Vector",18);
-        g.drawString(`Solved ${maze.n}X${maze.n} in\n ${timeToText(duration)} \nClick to play again`, g.getWidth()/2, g.getHeight()/2, true);
+        g.drawString(`Solved ${maze.n}X${maze.n} in\n ${timeToText(duration)} \nBtn1 to play again`, g.getWidth()/2, g.getHeight()/2, true);
       }
     }
   }, 25);
diff --git a/apps/acmaze/metadata.json b/apps/acmaze/metadata.json
index f453d8d85..d8ab8fa62 100644
--- a/apps/acmaze/metadata.json
+++ b/apps/acmaze/metadata.json
@@ -1,7 +1,7 @@
 { "id": "acmaze",
   "name": "AccelaMaze",
   "shortName":"AccelaMaze",
-  "version":"0.02",
+  "version":"0.03",
   "description": "Tilt the watch to roll a ball through a maze.",
   "icon": "app.png",
   "tags": "game",