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

messagesoverlay - Fix trying to draw on empty queue

master
Martin Boonk 2024-04-03 19:58:25 +02:00
parent 1ddbb79913
commit a6b92215fa
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/messagesoverlay/lib.js
View File

@ -166,7 +166,7 @@ let showMessage = function(ovr, msg) {
msg.new = false; msg.new = false;
if (!buzzing){ if (!buzzing){
buzzing = true; buzzing = true;
Bangle.buzz().then(()=>{setTimeout(()=>{buzzing = false;},2000)}); Bangle.buzz().then(()=>{setTimeout(()=>{buzzing = false;},2000);});
} }
Bangle.setLCDPower(1); Bangle.setLCDPower(1);
} }
@ -304,7 +304,7 @@ let drawMessage = function(ovr, msg) {
r += Math.max(metrics.height, metrics.maxImageHeight); r += Math.max(metrics.height, metrics.maxImageHeight);
}); });
return r; return r;
} };
ovr.setColor(ovr.theme.fg); ovr.setColor(ovr.theme.fg);
ovr.setBgColor(ovr.theme.bg); ovr.setBgColor(ovr.theme.bg);
@ -312,7 +312,7 @@ let drawMessage = function(ovr, msg) {
if (typeof msg.FirstLine === "undefined") msg.FirstLine = 0; if (typeof msg.FirstLine === "undefined") msg.FirstLine = 0;
let padding = eventQueue.length > 1 ? (eventQueue.length > 3 ? 7 : 5) : 3; let padding = eventQueue.length > 1 ? (eventQueue.length > 3 ? 7 : 5) : 3;
let yText = 40; let yText = 40;
let yLine = yText + 3; let yLine = yText + 3;
@ -334,7 +334,7 @@ let drawMessage = function(ovr, msg) {
let metrics = ovr.stringMetrics(line); let metrics = ovr.stringMetrics(line);
msg.lineHeights[i] = Math.max(metrics.height, metrics.maxImageHeight); msg.lineHeights[i] = Math.max(metrics.height, metrics.maxImageHeight);
}); });
} }
ovr.setFont(msg.bodyFont); ovr.setFont(msg.bodyFont);
ovr.setColor(ovr.theme.fg); ovr.setColor(ovr.theme.fg);
@ -355,7 +355,7 @@ let drawMessage = function(ovr, msg) {
let currentLine = msg.FirstLine; let currentLine = msg.FirstLine;
let drawnHeight = 0; let drawnHeight = 0;
while(drawnHeight < maxTextHeight) { while(drawnHeight < maxTextHeight) {
let lineHeight = msg.lineHeights[currentLine]; let lineHeight = msg.lineHeights[currentLine];
if (drawnHeight + lineHeight < maxTextHeight) { if (drawnHeight + lineHeight < maxTextHeight) {
@ -484,7 +484,9 @@ let updateClearingTimeout = ()=>{
LOG("Set new clearing timeout"); LOG("Set new clearing timeout");
clearingTimeout = setTimeout(()=>{ clearingTimeout = setTimeout(()=>{
LOG("setNewTimeout"); LOG("setNewTimeout");
drawMessage(ovr, eventQueue.pop()); let event = eventQueue.pop();
if (event)
drawMessage(ovr, event);
if (eventQueue.length > 0){ if (eventQueue.length > 0){
LOG("still got elements"); LOG("still got elements");
updateClearingTimeout(); updateClearingTimeout();
@ -498,7 +500,7 @@ let updateClearingTimeout = ()=>{
}; };
exports.message = function(type, event) { exports.message = function(type, event) {
LOG("Got message", type); LOG("Got message", type, event);
// only handle some event types // only handle some event types
if(!(type=="text" || type == "call")) return; if(!(type=="text" || type == "call")) return;
if(type=="text" && event.id == "nav") return; if(type=="text" && event.id == "nav") return;
@ -528,7 +530,6 @@ exports.message = function(type, event) {
ovr.theme = { fg:0, bg:1, fg2:1, bg2:0, fgH:1, bgH:0 }; ovr.theme = { fg:0, bg:1, fg2:1, bg2:0, fgH:1, bgH:0 };
ovr.clear(); ovr.clear();
main(ovr, event); main(ovr, event);
updateClearingTimeout(); updateClearingTimeout();