From b2187f6c26bdf25b29335830f437caa0bfcb2865 Mon Sep 17 00:00:00 2001 From: Balazs Varkonyi Date: Sun, 1 Oct 2017 19:27:57 +0200 Subject: [PATCH] Fixed displaying battery percentage under 20 percent --- source/Digital5View.mc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/source/Digital5View.mc b/source/Digital5View.mc index 557eafc..64933ce 100644 --- a/source/Digital5View.mc +++ b/source/Digital5View.mc @@ -304,19 +304,25 @@ class Digital5View extends Ui.WatchFace { } else { dc.setColor(charge < 20 ? BRIGHT_RED : upperForegroundColor, upperBackgroundColor); } - dc.fillRectangle(108, 20 , 24.0 * charge / 100.0, 7); + dc.fillRectangle(108, 20 , 24.0 * charge / 100.0, 7); + if (showChargePercentage) { + var shouldDrawPercentage = false; if (showPercentageUnder20) { if (charge <= 20) { + shouldDrawPercentage = true; dc.setColor(upperForegroundColor, upperBackgroundColor); } } else { + shouldDrawPercentage = true; dc.setColor(upperForegroundColor, upperBackgroundColor); } - dc.drawText(128, 0, digitalUpright16, charge.toNumber(), Gfx.TEXT_JUSTIFY_RIGHT); - dc.drawLine(129, 13, 135, 3); - dc.drawRectangle(129, 4, 3, 3); - dc.drawRectangle(132, 11, 3, 3); + if (shouldDrawPercentage) { + dc.drawText(128, 0, digitalUpright16, charge.toNumber(), Gfx.TEXT_JUSTIFY_RIGHT); + dc.drawLine(129, 13, 135, 3); + dc.drawRectangle(129, 4, 3, 3); + dc.drawRectangle(132, 11, 3, 3); + } } dc.setColor(upperForegroundColor, upperBackgroundColor);