Bangle.js: Modify E.showMessage/Prompt/Alert to clear the entire screen and redraw widgets (fix #1771)

Author: gfwilliams

ChangeLog

@@ -118,6 +118,7 @@
             Bangle.js: remove graphical_menu lib and inline specialised version into E.showMenu
             Bangle.js: Modify handling of widgets to allow variable width widgets (requires new widget JS)
             Changed 6x8 builtin font to a modified Dina_r400-6 supporting non-ASCII characters
+            Bangle.js: Modify E.showMessage/Prompt/Alert to clear the entire screen and redraw widgets (fix #1771)
 
      2v04 : Allow \1..\9 escape codes in RegExp
             ESP8266: reading storage is not working for boot from user2 (fix #1507)

libs/js/banglejs/E_showMessage.js

@@ -1,8 +1,7 @@
 (function(msg,title) {
-  g.reset();
-  g.clearRect(0,24,239,215); // leave room for widgets
-  g.setFont("6x8",2);
-  g.setFontAlign(0,0);
+  g.clear(1).flip(); // clear screen
+  Bangle.drawWidgets(); // redraw widgets
+  g.reset().setFont("6x8",2).setFontAlign(0,0);
   var loc = require("locale");
   var W = g.getWidth();
   var H = g.getHeight();

libs/js/banglejs/E_showMessage.min.js

@@ -11,10 +11,7 @@
   if (!options.selected)
     options.selected = 0;
   function draw() {
-    g.reset();
-    g.clearRect(0,24,239,215); // leave room for widgets
-    g.setFont("6x8",2);
-    g.setFontAlign(0,0);
+    g.reset().setFont("6x8",2).setFontAlign(0,0);
     var W = g.getWidth();
     var H = g.getHeight();
     var title = options.title;
@@ -47,26 +44,19 @@
                   x-bw-4,y+8,
                   x-bw-4,y-8,
                   x-bw,y-12];
-      if (idx==options.selected) {
-        g.setColor(0x02F7);
-        g.fillPoly(poly);
-        g.setColor(-1);
-      }
-      g.drawPoly(poly);
-      g.drawString(btn,x,y+1);
+      g.setColor(idx==options.selected ? 0x02F7 : 0).fillPoly(poly).setColor(-1).drawPoly(poly).drawString(btn,x,y+1);
       x += (buttonPadding+w)/2;
     });
-    g.setColor(-1);
-    g.flip();  // turn screen on
+    g.setColor(-1).flip();  // turn screen on
   }
 
   if (Bangle.btnWatches) {
     Bangle.btnWatches.forEach(clearWatch);
     Bangle.btnWatches = undefined;
   }
+  g.clear(1); // clear screen
+  Bangle.drawWidgets(); // redraw widgets
   if (!msg) {
-	g.clearRect(0,24,239,215); // leave room for widgets
-    g.flip(); // turn screen on
     return Promise.resolve();
   }
   draw();