From c4c0a55ceac8128297961c6183fb798b4bc2f2df Mon Sep 17 00:00:00 2001 From: Richard de Boer Date: Sun, 24 Apr 2022 19:43:34 +0200 Subject: [PATCH] cogclock: improve font --- apps/cogclock/15x32.png | Bin 0 -> 6247 bytes apps/cogclock/app.js | 17 +++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 apps/cogclock/15x32.png diff --git a/apps/cogclock/15x32.png b/apps/cogclock/15x32.png new file mode 100644 index 0000000000000000000000000000000000000000..0af326e718290e8f9f6445a30109f47dc8213ba9 GIT binary patch literal 6247 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 RU=;uW002ovPDHLkV1l)@#DM?+ literal 0 HcmV?d00001 diff --git a/apps/cogclock/app.js b/apps/cogclock/app.js index 2734b9a17..73a709e88 100644 --- a/apps/cogclock/app.js +++ b/apps/cogclock/app.js @@ -1,7 +1,8 @@ -Graphics.prototype.setFont16x32N = function() { +Graphics.prototype.setFont15x32N = function() { this.setFontCustom(atob( - "/////v////7////+4AAADuAAAA7gAAAO4AAADuAAAA7gAAAO4AAADuAAAA7gAAAO/////v////7////+AAAAAOAAAA7gAAAO4AAADuAAAA7gAAAO4AAADv////7////+/////gAAAA4AAAAOAAAADgAAAA4AAAAOAAAADgAAAADgA//+4AP//uAD//7gA4AO4AOADuADgA7gA4AO4AOADuADgA7gA4AO4AOADuADgA7//4AO//+ADv//gA4AAAAA4AOADuADgA7gA4AO4AOADuADgA7gA4AO4AOADuADgA7gA4AO4AOADuADgA7gA4AO/////v////7////+AAAAAP//gAD//4AA//+AAAADgAAAA4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA4AAAAOAAP////7////+/////gAAAAD//4AO//+ADv//gA7gA4AO4AOADuADgA7gA4AO4AOADuADgA7gA4AO4AOADuADgA7gA//+4AP//uAD//4AAAAA/////v////7////+4AOADuADgA7gA4AO4AOADuADgA7gA4AO4AOADuADgA7gA4AO4AP//uAD//7gA//+AAAAAOAAAADgAAAA4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA4AAAAP////7////+/////gAAAAD////+/////v////7gA4AO4AOADuADgA7gA4AO4AOADuADgA7gA4AO4AOADuADgA7////+/////v////4AAAAA//+ADv//gA7//4AO4AOADuADgA7gA4AO4AOADuADgA7gA4AO4AOADuADgA7gA4AO/////v////7////+AAAAAA==" - ), "0".charCodeAt(0), 16, 32); + // 15x32.png, converted using http://ebfc.mattbrailsford.com/ + "/////oAAAAKAAAACgAAAAoAAAAKAAAACgf//AoEAAQKB//8CgAAAAoAAAAKAAAACgAAAAoAAAAL////+/wAB/oEAAQKBAAECgf//AoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAAC////AgAAAQIAAAH+/w///oEIAAKBCAACgQgAAoEIAAKBCAACgQg/AoEIIQKB+CECgAAhAoAAIQKAACECgAAhAoAAIQL//+H+/w/h/oEIIQKBCCECgQghAoEIIQKBCCECgQghAoEIIQKB+D8CgAAAAoAAAAKAAAACgAAAAoAAAAL////+///gAIAAIACAACAAgAAgAIAAIAD/+CAAAAggAAAIIAAACD/+//gAAoAAAAKAAAACgAAAAoAAAAL////+///h/oAAIQKAACECgAAhAoAAIQKAACECgfghAoEIIQKBCD8CgQgAAoEIAAKBCAACgQgAAoEIAAL/D//+/////oAAAAKAAAACgAAAAoAAAAKAAAACgfg/AoEIIQKBCD8CgQgAAoEIAAKBCAACgQgAAoEIAAL/D//+/wAAAIEAAACBAAAAgQAAAIEAAACBAAAAgQAAAIH///6AAAACgAAAAoAAAAKAAAACgAAAAoAAAAL////+/////oAAAAKAAAACgAAAAoAAAAKAAAACgfg/AoEIIQKB+D8CgAAAAoAAAAKAAAACgAAAAoAAAAL////+///h/oAAIQKAACECgAAhAoAAIQKAACECgfghAoEIIQKB+D8CgAAAAoAAAAKAAAACgAAAAoAAAAL////+" + ), "0".charCodeAt(0), 15, 32); }; Bangle.setUI("clock"); // set UI first, so widgets know about Bangle.CLOCK @@ -69,15 +70,15 @@ function draw() { tooth = Math.round(d.getSeconds()/60*teeth), m = d.getMilliseconds(); if (year!==last.year) { - g.setFont("16x32N").setFontAlign(0, -1) // center top - .drawString(year, x, y+34, true); + g.setFont("15x32N").setFontAlign(0, -1) // center top + .drawString(year, x, y+32, true); } if (date!==last.date) { - g.setFont("16x32N").setFontAlign(0, 1) // center bottom - .drawString(date, x, y-34, true); + g.setFont("15x32N").setFontAlign(0, 1) // center bottom + .drawString(date, x, y-32, true); } if (time!==last.time) { - g.setFont("16x32N:2").setFontAlign(0, 0) // center middle + g.setFont("15x32N:2").setFontAlign(0, 0) // center middle .drawString(time, x, y, true); } if (tooth!==last.tooth) {