code cleanup
parent
a99f21aab7
commit
4ee05c01c9
|
|
@ -358,7 +358,6 @@ function diffToTarget() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function draw() {
|
function draw() {
|
||||||
|
|
||||||
var nowFormatted = formatDateTime(new Date(), settings.dateFormat, settings.time24, temp_displaySeconds);
|
var nowFormatted = formatDateTime(new Date(), settings.dateFormat, settings.time24, temp_displaySeconds);
|
||||||
var targetFormatted = formatDateTime(target, settings.dateFormat, settings.time24, true);
|
var targetFormatted = formatDateTime(target, settings.dateFormat, settings.time24, true);
|
||||||
var diff = diffToTarget();
|
var diff = diffToTarget();
|
||||||
|
|
@ -394,21 +393,20 @@ function draw() {
|
||||||
// draw target date
|
// draw target date
|
||||||
g.setFont("Vector", SMALL_FONT_SIZE).setFontAlign(-1, -1).setColor(COLOUR_RED);
|
g.setFont("Vector", SMALL_FONT_SIZE).setFontAlign(-1, -1).setColor(COLOUR_RED);
|
||||||
g.drawString(targetFormatted.date, 4 + 16 + 6, y);
|
g.drawString(targetFormatted.date, 4 + 16 + 6, y);
|
||||||
|
y += SMALL_FONT_SIZE;
|
||||||
|
|
||||||
|
// draw target time
|
||||||
|
g.setFont("Vector", SMALL_FONT_SIZE).setFontAlign(-1, -1).setColor(COLOUR_RED);
|
||||||
|
g.drawString(targetFormatted.time, 4, y);
|
||||||
|
y += SMALL_FONT_SIZE + 4;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// draw NOT SET
|
// draw NOT SET
|
||||||
g.setFont("Vector", SMALL_FONT_SIZE).setFontAlign(-1, -1).setColor(COLOUR_RED);
|
g.setFont("Vector", SMALL_FONT_SIZE).setFontAlign(-1, -1).setColor(COLOUR_RED);
|
||||||
g.drawString("NOT SET", 4 + 16 + 6, y);
|
g.drawString("NOT SET", 4 + 16 + 6, y);
|
||||||
|
y += 2 * SMALL_FONT_SIZE + 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
y += SMALL_FONT_SIZE;
|
|
||||||
|
|
||||||
// draw target time
|
|
||||||
if (data.target.isSet) {
|
|
||||||
g.setFont("Vector", SMALL_FONT_SIZE).setFontAlign(-1, -1).setColor(COLOUR_RED);
|
|
||||||
g.drawString(targetFormatted.time, 4, y);
|
|
||||||
}
|
|
||||||
y += SMALL_FONT_SIZE + 4;
|
|
||||||
|
|
||||||
// draw separator
|
// draw separator
|
||||||
g.setColor(COLOUR_BLACK);
|
g.setColor(COLOUR_BLACK);
|
||||||
g.drawLine(0, y - 4, SCREEN_WIDTH, y - 4);
|
g.drawLine(0, y - 4, SCREEN_WIDTH, y - 4);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue