Tweaks to allow up to 6 buttons in showPrompt, different heights as per https://github.com/orgs/espruino/discussions/7692#discussioncomment-12418912

Bangle.js2: Fix issue when an onchange callback from E.showMenu submenu changes the menu immediately - see https://github.com/orgs/espruino/discussions/7697

Author: gfwilliams

ChangeLog

@@ -19,6 +19,8 @@
             STM32: Ensure proper distribution of analogRead values (now `0<=analogRead()<1` as on other boards) and add docs (fix #2612)
             Change ioBuffer FIFO from 4 byte blocks to variable length blocks. Far more efficient for USB/BLE/other block data
             STM32: Fix spi.write usage on same port that SD card is used with (fix #2613)
+            Bangle.js2: Added new Renaissance fonts and g.findFont function for selecting the best font
+            Bangle.js2: Fix issue when an onchange callback from E.showMenu submenu changes the menu immediately
 
      2v25 : ESP32C3: Get analogRead working correctly
             Graphics: Adjust image alignment when rotating images to avoid cropping (fix #2535)

libs/js/banglejs/E_showMenu_Q3.js

@@ -24,7 +24,7 @@
     if (!item.noList && item.min!==undefined && item.max!==undefined &&
         ((item.max-item.min)/step)<20) {
       // show scrolling menu of options
-      E.showScroller({
+      var scroller = E.showScroller({
         h : H, c : (item.max+step-item.min)/step,
         back: show, // redraw original menu
         remove: options.remove,
@@ -45,8 +45,10 @@
           Bangle.buzz(20);
           item.value = item.min + idx*step;
           if (item.onchange) item.onchange(item.value);
-          scr.scroll = l.scroller.scroll; // set scroll to prev position
-          show(); // redraw original menu
+          if (scroller.isActive()) { // onchange may have changed menu!
+            scr.scroll = l.scroller.scroll; // set scroll to prev position
+            show(); // redraw original menu
+          }
         }
       });
     } else {
@@ -72,8 +74,10 @@
         } else { // actually selected
           item.value = v;
           if (item.onchange) item.onchange(item.value);
-          scr.scroll = l.scroller.scroll; // set scroll to prev position
-          show(); // redraw original menu
+          if (Bangle.uiRedraw == draw) { // onchange may have changed menu!
+            scr.scroll = l.scroller.scroll; // set scroll to prev position
+            show(); // redraw original menu
+          }
         }
       }
       draw();
@@ -123,14 +127,14 @@
         var v = item.value;
         if (item.format) v=item.format(v);
         var val = g.findFont(v, {w:r.w/2,h:r.h,wrap:1,trim:1});
-        g.setFontAlign(1,0).drawString(val.text,r.x+r.w-8,r.y+H/2);
+        g.setFontAlign(1,0).drawString(val.text,r.x+r.w-8,2+r.y+H/2);
         pad += g.stringWidth(val.text);
       } else if ("function" == typeof item) {
         g.drawImage(/* 9x18 */atob("CRKBAGA4Hg8DwPB4HgcDg8PB4eHg8HAwAA=="), r.x+r.w-21, r.y+H/2-9);
         pad += 16;
       }
       var itemText = g.findFont((item&&item.title)??keys[idx], {w:r.w-pad,h:r.h,wrap:1,trim:1});
-      g.setFontAlign(-1,0).drawString(itemText.text, r.x+8, 1+r.y+H/2);
+      g.setFontAlign(-1,0).drawString(itemText.text, r.x+8, 2+r.y+H/2);
     },
     select : function(idx, touch) {
       if (idx<0) return back&&back(); // title

libs/js/banglejs/E_showMenu_Q3.min.js

@@ -3,6 +3,7 @@
   if (!options.buttons)
     options.buttons = {"Yes":true,"No":false};
   var btns = Object.keys(options.buttons);
+  if (btns.length>6) throw new Error(">6 buttons");
   var btnPos;
   function draw(highlightedButton) {
     g.reset().setFontAlign(0,0);
@@ -13,9 +14,9 @@
         clearRect(0,Y,W-1,Y+4+title.h).
         drawString(title.text,W/2,Y+4+title.h/2);
     Y += title.h+4;
-    var BX = Math.min(2,btns.length),
+    var BX = 0|"0123233"[btns.length],
         BY = Math.ceil(btns.length / BX),
-        BW = W/BX, BH = 40;
+        BW = (W-1)/BX, BH = (BY>1 || options.img)?40:50;
     var H = R.y2-(Y + BY*BH);
     if (options.img) {
       var im = g.imageMetrics(options.img);
@@ -28,22 +29,21 @@
       drawString(msg.text,W/2,Y+H/2);
     btnPos = [];
     btns.forEach((btn,idx)=>{
-      var x = (idx&1)*BW + 2, y = R.y2-(BY-(idx>>1))*BH - 2,
-          bw = BW-5, poly = [x+4,y,
+      var ix=idx%BX,iy=0|(idx/BX),x = ix*BW + 2, y = R.y2-(BY-iy)*BH + 1,
+          bw = BW-4, bh = BH-2, poly = [x+4,y,
                   x+bw-4,y,
                   x+bw,y+4,
-                  x+bw,y+BH-4,
-                  x+bw-4,y+BH,
-                  x+4,y+BH,
-                  x,y+BH-4,
+                  x+bw,y+bh-4,
+                  x+bw-4,y+bh,
+                  x+4,y+bh,
+                  x,y+bh-4,
                   x,y+4,
                   x+4,y];
-      btnPos.push({x1:x-2, x2:x+bw,
-                   y1:y, y2:y+BH+2,
-                   poly: poly});
+      btnPos.push({x1:x-2, x2:x+BW-2,
+                   y1:y, y2:y+BH});
       var btnText = g.findFont(btn, {w:bw-4,h:BH-4,wrap:1});
       g.setColor(idx===highlightedButton ? g.theme.bgH : g.theme.bg2).fillPoly(poly).
-        setColor(idx===highlightedButton ? g.theme.fgH : g.theme.fg2).drawPoly(poly).drawString(btnText.text,x+bw/2,y+BH/2);
+        setColor(idx===highlightedButton ? g.theme.fgH : g.theme.fg2).drawPoly(poly).drawString(btnText.text,x+bw/2,y+2+BH/2);
       if (idx&1) y+=BH;
     });
     Bangle.setLCDPower(1); // ensure screen is on
@@ -57,8 +57,9 @@
   return new Promise(resolve=>{
     var ui = {mode:"custom", remove: options.remove, redraw: draw, back:options.back, touch:(_,e)=>{
       btnPos.forEach((b,i)=>{
-        if (e.x > b.x1 && e.x < b.x2 &&
-            e.y > b.y1 && e.y < b.y2) {
+        if (e.x >= b.x1 && e.x <= b.x2 &&
+            e.y >= b.y1 && e.y <= b.y2 && !e.hit) {
+          e.hit = true; // ensure we don't call twice if the buttons overlap
           draw(i); // highlighted button
           g.flip(); // write to screen
           E.showPrompt(); // remove