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

Revert "voldisp: make sure widgets wont draw over volume bar" 

This reverts commit fec5eb0804.
master
thyttan 2025-03-21 18:59:39 +01:00
parent 108a932a58
commit 0b5af5f48e
1 changed files with 11 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
apps/voldisp/boot.js
View File

@ -4,44 +4,6 @@
if (timeout) {clearTimeout(timeout); timeout=undefined;} if (timeout) {clearTimeout(timeout); timeout=undefined;}
if (Bangle.CLOCK) { if (Bangle.CLOCK) {
const WIDGET_UTILS_HIDE = function() {
//exports.cleanup();
if (!global.WIDGETS) return;
g.reset(); // reset colors
for (var w of global.WIDGETS) {
if (w._draw) return; // already hidden
w._draw = w.draw;
w.draw = () => {};
w._area = w.area;
w.area = "";
if (w.x!=undefined) g.clearRect(w.x,w.y,w.x+w.width-1,w.y+23);
}
};
/// Show any hidden widgets
const WIDGET_UTILS_SHOW = function() {
//exports.cleanup();
if (!global.WIDGETS) return;
for (var w of global.WIDGETS) {
if (!w._draw) return; // not hidden
w.draw = w._draw;
w.area = w._area;
delete w._draw;
delete w._area;
w.draw(w);
}
};
let isAllWidgetsHidden = true;
if (global.WIDGETS) {
for (var w of global.WIDGETS) {
if (!w._draw) {
isAllWidgetsHidden = false;
break;
}
}
}
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).
@ -50,9 +12,17 @@
drawString("volume",barWidth,1); drawString("volume",barWidth,1);
let goAway = ()=>{ let goAway = ()=>{
let isAllWidgetsHidden = true;
if (global.WIDGETS) {
for (var w of global.WIDGETS) {
if (!w._draw) {
isAllWidgetsHidden = false;
break;
}
}
}
if (!isAllWidgetsHidden) { if (!isAllWidgetsHidden) {
g.reset().clearRect(0,0,g.getWidth(),24); Bangle.drawWidgets();
WIDGET_UTILS_SHOW();
} else if (Bangle.uiRedraw) { } else if (Bangle.uiRedraw) {
Bangle.uiRedraw(); Bangle.uiRedraw();
} else { } else {
@ -63,5 +33,5 @@
} }
}; };
Bangle.on("musicVolume", onMusicVolume); Bangle.on("musicVolume", onMusicVolume);
//GB({t:"audio",v:66}); //GB({t:"audio",v:10});
} }