bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "voldisp: fix logic re hide/show widgets and how to `goAway`" 

This reverts commit 1fa489b918.
master
thyttan 2025-03-21 18:56:55 +01:00
parent 1fa489b918
commit cc97e86709
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/voldisp/boot.js
View File

@ -26,7 +26,6 @@
} }
}; };
let isWeHidingTheWidgets = false;
let timeout; let timeout;
let onMusicVolume = (volPercent)=>{ let onMusicVolume = (volPercent)=>{
if (timeout) {clearTimeout(timeout);} if (timeout) {clearTimeout(timeout);}
@ -34,20 +33,15 @@
if (Bangle.CLOCK) { if (Bangle.CLOCK) {
let isAllWidgetsHidden = true; let isAllWidgetsHidden = true;
if (!timeout) { // No need to do this if we already did it before and it wasn't undone. I.e. the timout to execute `goAway` never ran out. if (global.WIDGETS) {
if (global.WIDGETS) { for (var w of global.WIDGETS) {
for (var w of global.WIDGETS) { if (!w._draw) {
if (!w._draw) { isAllWidgetsHidden = false;
isAllWidgetsHidden = false; break;
break;
}
} }
} }
if (!isAllWidgetsHidden) {
WIDGET_UTILS_HIDE();
isWeHidingTheWidgets = true; // Remember if it was we who hid the widgets between draws of the volume bar.
}
} }
if (!timeout) {WIDGET_UTILS_HIDE();}
let barWidth = g.getWidth()*volPercent/100; let barWidth = g.getWidth()*volPercent/100;
g. g.
setColor(0x0000).fillRect(0,0,g.getWidth(),24). setColor(0x0000).fillRect(0,0,g.getWidth(),24).
@ -56,10 +50,9 @@
drawString("volume",barWidth,1); drawString("volume",barWidth,1);
let goAway = ()=>{ let goAway = ()=>{
if (isWeHidingTheWidgets) { if (!isAllWidgetsHidden) {
g.reset().clearRect(0,0,g.getWidth(),24); g.reset().clearRect(0,0,g.getWidth(),24);
WIDGET_UTILS_SHOW(); WIDGET_UTILS_SHOW();
isWeHidingTheWidgets = false;
} else if (Bangle.uiRedraw) { } else if (Bangle.uiRedraw) {
Bangle.uiRedraw(); Bangle.uiRedraw();
} else { } else {