From ab30d2dd6bf9f2c424d4cd90f1cb18c9de2d60b9 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 24 Jun 2020 10:20:39 +0100
Subject: [PATCH] launcher 0.04: Now displays widgets

---
 apps.json             |  2 +-
 apps/launch/ChangeLog |  1 +
 apps/launch/app.js    | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps.json b/apps.json
index 793dad65f..d55450d57 100644
--- a/apps.json
+++ b/apps.json
@@ -41,7 +41,7 @@
     "name": "Launcher (Default)",
     "shortName":"Launcher",
     "icon": "app.png",
-    "version":"0.03",
+    "version":"0.04",
     "description": "This is needed by Bangle.js to display a menu allowing you to choose your own applications. You can replace this with a customised launcher.",
     "tags": "tool,system,launcher",
     "type":"launch",
diff --git a/apps/launch/ChangeLog b/apps/launch/ChangeLog
index fe5aa9d0e..7e7ea65ab 100644
--- a/apps/launch/ChangeLog
+++ b/apps/launch/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Only store relevant app data (saves RAM when many apps)
 0.03: Allow scrolling to wrap around (fix #382)
+0.04: Now displays widgets
diff --git a/apps/launch/app.js b/apps/launch/app.js
index b20c808a1..9795d8901 100644
--- a/apps/launch/app.js
+++ b/apps/launch/app.js
@@ -1,5 +1,5 @@
 var s = require("Storage");
-var apps = s.list(/\.info$/).map(app=>{var a=s.readJSON(app,1);return a&&{name:a.name,type:a.type,icon:a.icon,sortorder:a.sortorder,src:a.src}}).filter(app=>app && (app.type=="app" || app.type=="clock" || !app.type));
+var apps = s.list(/\.info$/).map(app=>{var a=s.readJSON(app,1);return a&&{name:a.name,type:a.type,icon:a.icon,sortorder:a.sortorder,src:a.src};}).filter(app=>app && (app.type=="app" || app.type=="clock" || !app.type));
 apps.sort((a,b)=>{
   var n=(0|a.sortorder)-(0|b.sortorder);
   if (n) return n; // do sortorder first
@@ -17,10 +17,13 @@ function drawMenu() {
   var n = 3;
   if (selected>=n+menuScroll) menuScroll = 1+selected-n;
   if (selected<menuScroll) menuScroll = selected;
-  if (menuScroll) g.fillPoly([120,0,100,20,140,20]);
-  else g.clearRect(100,0,140,20);
-  if (apps.length>n+menuScroll) g.fillPoly([120,239,100,219,140,219]);
-  else g.clearRect(100,219,140,239);
+  // arrows
+  g.setColor(menuScroll ? -1 : 0);
+  g.fillPoly([120,6,106,20,134,20]);
+  g.setColor((apps.length>n+menuScroll) ? -1 : 0);
+  g.fillPoly([120,233,106,219,134,219]);
+  // draw
+  g.setColor(-1);
   for (var i=0;i<n;i++) {
     var app = apps[i+menuScroll];
     if (!app) break;
@@ -59,3 +62,5 @@ setWatch(function() { // run
     load(apps[selected].src);
   }
 }, BTN2, {repeat:true,edge:"falling"});
+Bangle.loadWidgets();
+Bangle.drawWidgets();