From 5f91cf37cd7e8276fdce26ae450b4d29a2f7dbfd Mon Sep 17 00:00:00 2001 From: hughbarney Date: Thu, 21 Oct 2021 20:22:46 +0100 Subject: [PATCH] Widbatpc: - revert hide change --- apps/widbatpc/ChangeLog | 1 - apps/widbatpc/settings.js | 11 ++--------- apps/widbatpc/widget.js | 3 +-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/apps/widbatpc/ChangeLog b/apps/widbatpc/ChangeLog index b8e594fc4..09e4fabf4 100644 --- a/apps/widbatpc/ChangeLog +++ b/apps/widbatpc/ChangeLog @@ -10,4 +10,3 @@ 0.11: Don't overwrite existing settings on app update 0.12: Fixed for Bangle 2 0.13: Fillbar setting added, see README -0.14: Added setting to completely hide the widget diff --git a/apps/widbatpc/settings.js b/apps/widbatpc/settings.js index 55588238d..7dceaa2a8 100644 --- a/apps/widbatpc/settings.js +++ b/apps/widbatpc/settings.js @@ -12,8 +12,7 @@ 'percentage': true, 'fillbar': false, 'charger': true, - 'hideifmorethan': 100, - 'hidewidget': false, + 'hideifmorethan': 100 } // ...and overwrite them with any saved values // This way saved values are preserved if a new version adds more settings @@ -33,7 +32,6 @@ } const onOffFormat = b => (b ? 'On' : 'Off') - const yesNoFormat = b => (b ? 'Yes' : 'No') const menu = { '': { 'title': 'Battery Widget' }, '< Back': back, @@ -69,12 +67,7 @@ step: 10, format: x => x+"%", onchange: save('hideifmorethan'), - }, - 'Hide Widget': { - value: s.hidewidget, - format: yesNoFormat, - onchange: save('hidewidget'), - }, + } } E.showMenu(menu) }) diff --git a/apps/widbatpc/widget.js b/apps/widbatpc/widget.js index 574c22f6c..f6477c9bb 100644 --- a/apps/widbatpc/widget.js +++ b/apps/widbatpc/widget.js @@ -28,7 +28,7 @@ 'color': 'By Level', 'percentage': true, 'charger': true, - 'hideifmorethan': 100, + 'hideifmorethan': 100 }; Object.keys(DEFAULTS).forEach(k=>{ if (settings[k]===undefined) settings[k]=DEFAULTS[k] @@ -76,7 +76,6 @@ function draw() { // if hidden, don't draw if (!WIDGETS["batpc"].width) return; - if (setting('hidewidget')) return; // else... var s = 39; var x = this.x, y = this.y;