Bangle.js: Modify handling of widgets to allow variable width widgets (requires new widget JS)

Author: gfwilliams

ChangeLog

@@ -116,6 +116,7 @@
             Add euro symbol to 6x8 and 4x6 fonts as char code 128 (ISO10646-1)
             Bangle.js: Use 'locale' library to translate E.showMenu/Prompt/Alert/etc
             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)
 
      2v04 : Allow \1..\9 escape codes in RegExp
             ESP8266: reading storage is not working for boot from user2 (fix #1507)

libs/js/banglejs/Bangle_drawWidgets.js

@@ -1,3 +1,18 @@
 (function() {
-  if (global.WIDGETS) for (var w of WIDGETS) w.draw();
+  var w=g.getWidth(), h=g.getHeight();
+  var pos = {
+	  tl:{x:32, y:0, r:0}, // if r==1, we're right->left
+	  tr:{x:w-32, y:0, r:1},
+	  bl:{x:32, y:h-24, r:0},
+	  br:{x:w-32, y:h-24, r:1}
+  };
+  g.reset().clearRect(0,0,w-1,23).clearRect(0,h-24,w-1,h-1);
+  if (global.WIDGETS) for (var wd of WIDGETS) {
+	  var p = pos[wd.area];
+	  if (!p) return;
+	  wd.x = p.x - p.r*wd.width;
+	  wd.y = p.y;
+	  p.x += wd.width*(1-2*p.r);
+	  wd.draw(wd);
+  }
 })

libs/js/banglejs/Bangle_drawWidgets.min.js

@@ -1,5 +1,4 @@
 (function() {
-  global.WIDGETPOS={tl:32,tr:g.getWidth()-32,bl:32,br:g.getWidth()-32};
   global.WIDGETS={};
   require("Storage").list(/\.wid\.js$/).forEach(widget=>eval(require("Storage").read(widget)));
 })