widalarmeta: Draw bell only once
parent
3ca236d835
commit
22259d13be
|
|
@ -19,7 +19,7 @@
|
||||||
}
|
}
|
||||||
} // getNextAlarm
|
} // getNextAlarm
|
||||||
|
|
||||||
function draw() {
|
function draw(fromInterval) {
|
||||||
if (this.nextAlarm === undefined) {
|
if (this.nextAlarm === undefined) {
|
||||||
let alarm = getNextAlarm();
|
let alarm = getNextAlarm();
|
||||||
if (alarm === undefined) {
|
if (alarm === undefined) {
|
||||||
|
|
@ -58,10 +58,14 @@
|
||||||
if (drawSeconds) {
|
if (drawSeconds) {
|
||||||
calcWidth += 3*5;
|
calcWidth += 3*5;
|
||||||
}
|
}
|
||||||
|
this.bellVisible = false;
|
||||||
} else if (config.drawBell && this.numActiveAlarms > 0) {
|
} else if (config.drawBell && this.numActiveAlarms > 0) {
|
||||||
// next alarm too far in future, draw only widalarm bell
|
|
||||||
g.reset().drawImage(atob("GBgBAAAAAAAAABgADhhwDDwwGP8YGf+YMf+MM//MM//MA//AA//AA//AA//AA//AA//AB//gD//wD//wAAAAADwAABgAAAAAAAAA"),this.x,this.y);
|
|
||||||
calcWidth = 24;
|
calcWidth = 24;
|
||||||
|
// next alarm too far in future, draw only widalarm bell
|
||||||
|
if (this.bellVisible !== true || fromInterval !== true) {
|
||||||
|
g.reset().drawImage(atob("GBgBAAAAAAAAABgADhhwDDwwGP8YGf+YMf+MM//MM//MA//AA//AA//AA//AA//AA//AB//gD//wD//wAAAAADwAABgAAAAAAAAA"),this.x,this.y);
|
||||||
|
this.bellVisible = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.width !== calcWidth) {
|
if (this.width !== calcWidth) {
|
||||||
|
|
@ -81,8 +85,8 @@
|
||||||
clearTimeout(this.timeoutId);
|
clearTimeout(this.timeoutId);
|
||||||
}
|
}
|
||||||
this.timeoutId = setTimeout(()=>{
|
this.timeoutId = setTimeout(()=>{
|
||||||
this.timeoutId = undefined;
|
WIDGETS["widalarmeta"].timeoutId = undefined;
|
||||||
this.draw();
|
WIDGETS["widalarmeta"].draw(true);
|
||||||
}, timeout);
|
}, timeout);
|
||||||
} /* draw */
|
} /* draw */
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue