Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

barclock: whitespace

master
Richard de Boer 2022-06-26 14:16:24 +02:00
parent 86e3ee489b
commit 29eedee899
No known key found for this signature in database
GPG Key ID: 8721727971871937
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/barclock/clock-bar.js
View File

@ -13,7 +13,7 @@ let locale = require("locale");
locale.hasMeridian = (locale.meridian(date)!==""); locale.hasMeridian = (locale.meridian(date)!=="");
} }
let barW = 0,prevX = 0; let barW = 0, prevX = 0;
function renderBar(l) { function renderBar(l) {
"ram"; "ram";
if (l) prevX = 0; // called from Layout: drawing area was cleared if (l) prevX = 0; // called from Layout: drawing area was cleared
@ -23,11 +23,10 @@ function renderBar(l) {
if (x2===prevX) return; // nothing to do if (x2===prevX) return; // nothing to do
if (x2===0) x2--; // don't leave 1px line if (x2===0) x2--; // don't leave 1px line
if (x2<Math.max(0, prevX)) g.setBgColor(l.bgCol || g.theme.bg).clearRect(x2+1, l.y, prevX, l.y2); if (x2<Math.max(0, prevX)) g.setBgColor(l.bgCol || g.theme.bg).clearRect(x2+1, l.y, prevX, l.y2);
else g.setColor(l.col||g.theme.fg).fillRect(prevX+1, l.y, x2, l.y2); else g.setColor(l.col || g.theme.fg).fillRect(prevX+1, l.y, x2, l.y2);
prevX = x2; prevX = x2;
} }
function timeText(date) { function timeText(date) {
if (!clock.is12Hour) { if (!clock.is12Hour) {
return locale.time(date, true); return locale.time(date, true);
@ -54,16 +53,16 @@ function dateText(date) {
const ClockFace = require("ClockFace"), const ClockFace = require("ClockFace"),
clock = new ClockFace({ clock = new ClockFace({
precision:1, precision: 1,
settingsFile:'barclock.settings.json', settingsFile: "barclock.settings.json",
init: function() { init: function() {
const Layout = require("Layout"); const Layout = require("Layout");
this.layout = new Layout({ this.layout = new Layout({
type: "v", c: [ type: "v", c: [
{ {
type: "h", c: [ type: "h", c: [
{id: "time", label: "88:88", type: "txt", font: "6x8:5", col:g.theme.fg, bgCol: g.theme.bg}, // updated below {id: "time", label: "88:88", type: "txt", font: "6x8:5", col: g.theme.fg, bgCol: g.theme.bg}, // updated below
{id: "ampm", label: " ", type: "txt", font: "6x8:2", col:g.theme.fg, bgCol: g.theme.bg}, {id: "ampm", label: " ", type: "txt", font: "6x8:2", col: g.theme.fg, bgCol: g.theme.bg},
], ],
}, },
{id: "bar", type: "custom", fillx: 1, height: 6, col: g.theme.fg2, render: renderBar}, {id: "bar", type: "custom", fillx: 1, height: 6, col: g.theme.fg2, render: renderBar},