imageclock - Use widget_utils module

master
Martin Boonk 2022-10-30 10:54:23 +01:00
parent 5c110a89fb
commit ad88625b8c
1 changed files with 4 additions and 23 deletions

View File

@ -604,12 +604,8 @@ let firstDraw = true;
promise.then(()=>{ promise.then(()=>{
let currentDrawingTime = Date.now(); let currentDrawingTime = Date.now();
if (showWidgets && global.WIDGETS){ if (showWidgets){
//print("Draw widgets");
restoreWidgetDraw(); restoreWidgetDraw();
Bangle.drawWidgets();
g.setColor(g.theme.fg);
g.drawLine(0,24,g.getWidth(),24);
} }
lastDrawTime = Date.now() - start; lastDrawTime = Date.now() - start;
isDrawing=false; isDrawing=false;
@ -754,13 +750,8 @@ let firstDraw = true;
let currentDragDistance = 0; let currentDragDistance = 0;
let restoreWidgetDraw = function(){ let restoreWidgetDraw = function(){
if (global.WIDGETS) { require("widget_utils").show();
for (let w in global.WIDGETS) { Bangle.drawWidgets();
let wd = global.WIDGETS[w];
wd.draw = originalWidgetDraw[w];
wd.area = originalWidgetArea[w];
}
}
}; };
let handleDrag = function(e){ let handleDrag = function(e){
@ -814,17 +805,7 @@ let firstDraw = true;
let clearWidgetsDraw = function(){ let clearWidgetsDraw = function(){
//print("Clear widget draw calls"); //print("Clear widget draw calls");
if (global.WIDGETS) { require("widget_utils").hide();
originalWidgetDraw = {};
originalWidgetArea = {};
for (let w in global.WIDGETS) {
let wd = global.WIDGETS[w];
originalWidgetDraw[w] = wd.draw;
originalWidgetArea[w] = wd.area;
wd.draw = () => {};
wd.area = "";
}
}
} }
handleLock(Bangle.isLocked(), true); handleLock(Bangle.isLocked(), true);