diff --git a/apps/widclk/widget.js b/apps/widclk/widget.js index 7c281f761..a31bd4772 100644 --- a/apps/widclk/widget.js +++ b/apps/widclk/widget.js @@ -6,7 +6,7 @@ WIDGETS["wdclk"]={area:"tl",width:Bangle.CLOCK?0:52/* g.stringWidth("00:00") */, this.width = Bangle.CLOCK?0:52; return setTimeout(Bangle.drawWidgets,1); // widget changed size - redraw } - if (!this.width) return; // if size not right, return + if (!this.width) return; // if not visible, return g.reset().setFontCustom(atob("AAAAAAAAAAIAAAQCAQAAAd0BgMBdwAAAAAAAdwAB0RiMRcAAAERiMRdwAcAQCAQdwAcERiMRBwAd0RiMRBwAAEAgEAdwAd0RiMRdwAcERiMRdwAFAAd0QiEQdwAdwRCIRBwAd0BgMBAAABwRCIRdwAd0RiMRAAAd0QiEQAAAAAAAAAA="), 32, atob("BgAAAAAAAAAAAAAAAAYCAAYGBgYGBgYGBgYCAAAAAAAABgYGBgYG"), 512+9); var time = require("locale").time(new Date(),1); g.drawString(time, this.x, this.y+3, true); // 5 * 6*2 = 60 diff --git a/apps/widclkbttm/widclkbttm.wid.js b/apps/widclkbttm/widclkbttm.wid.js index 3b523b58d..50142a5b9 100644 --- a/apps/widclkbttm/widclkbttm.wid.js +++ b/apps/widclkbttm/widclkbttm.wid.js @@ -1,13 +1,9 @@ -WIDGETS["wdclkbttm"]={area:"br",width:60,draw:function() { - console.log("clock? "+Bangle.CLOCK); - if (Bangle.CLOCK){ - return; //avoid 2 clocks - } +WIDGETS["wdclkbttm"]={area:"br",width:Bangle.CLOCK?0:60,draw:function() { if (!Bangle.CLOCK == !this.width) { // if we're the wrong size for if we have a clock or not... this.width = Bangle.CLOCK?0:60; return setTimeout(Bangle.drawWidgets,1); // widget changed size - redraw } - if (!this.width) return; // if size not right, return + if (!this.width) return; // if not visible, return g.reset().setFont("6x8", 2).setFontAlign(-1, 0); var time = require("locale").time(new Date(),1); g.drawString(time, this.x, this.y+11, true); // 5 * 6*2 = 60