From f4b1eb00328681c0fd50dd323bd3b1ba8b9a0ce2 Mon Sep 17 00:00:00 2001
From: David Peer <david.peer@outlook.com>
Date: Mon, 12 Sep 2022 07:25:32 +0200
Subject: [PATCH] First menu is already working.

---
 apps/bwclk/app.js | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/apps/bwclk/app.js b/apps/bwclk/app.js
index 93fc0f1d7..dd4856aa0 100644
--- a/apps/bwclk/app.js
+++ b/apps/bwclk/app.js
@@ -172,22 +172,15 @@ menu.forEach((menuItm, x) => {
 
       console.log("Draw item", item.name);
 
-      g.setFontAlign(0,0);
-      g.setSmallFont();
-
-      var y = 147;
       var info = item.get();
-      var imgWidth = 24;
-      var strWidth = g.stringWidth(info.text);
-      g.setColor(g.theme.fg).fillRect(0, y-14, W, H);
-      g.setColor(g.theme.bg).drawString(info.text, W/2 + imgWidth/2 + 2, y+3);
-      g.drawImage(info.img, W/2 + -strWidth/2-4 - parseInt(imgWidth/2), y - parseInt(imgWidth/2));
+      drawMenuItem(info.text, info.img);
     }
 
     item.on('redraw', drawItem);
   })
 });
 
+
 /************
  * Custom menu elements
  *   Those are BW custom and should not be available
@@ -283,9 +276,24 @@ function drawTime(){
 }
 
 
-function drawMenu(){
-    if(settings.menuPosX < 0){
+function drawMenuItem(text, image){
+  g.setFontAlign(0,0);
+  g.setSmallFont();
 
+  var y = 147;
+  var imgWidth = 24;
+  var strWidth = g.stringWidth(text);
+  g.setColor(g.theme.fg).fillRect(0, y-14, W, H);
+  g.setColor(g.theme.bg).drawString(text, W/2 + imgWidth/2 + 2, y+3);
+  g.drawImage(image, W/2 + -strWidth/2-4 - parseInt(imgWidth/2), y - parseInt(imgWidth/2));
+}
+
+
+function drawMenu(){
+    // Draw category if needed
+    if(settings.menuPosY < 0){
+      var menuEntry = menu[settings.menuPosX];
+      drawMenuItem(menuEntry.name, menuEntry.img);
       return;
     }