FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Allow drawing rectangles

pull/1916/head
Martin Boonk 2022-03-06 13:18:46 +01:00
parent c24be8c698
commit 1a6683695c
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/imageclock/app.js
View File

@ -441,6 +441,27 @@ function drawPoly(resources, element, offset){
endPerfLog("drawPoly");
}
function drawRect(resources, element, offset){
startPerfLog("drawRect");
var vertices = [];
var primitiveOffset = offset.clone();
if (element.X) primitiveOffset.X += element.X;
if (element.Y) primitiveOffset.Y += element.Y;
if (element.ForegroundColor) g.setColor(element.ForegroundColor);
if (element.Filled){
startPerfLog("drawRect_g.fillRect");
g.fillRect(primitiveOffset.X, primitiveOffset.Y, primitiveOffset.X + element.Width, primitiveOffset.Y + element.Height);
endPerfLog("drawRect_g.fillRect");
} else {
startPerfLog("drawRect_g.fillRect");
g.drawRect(primitiveOffset.X, primitiveOffset.Y, primitiveOffset.X + element.Width, primitiveOffset.Y + element.Height);
endPerfLog("drawRect_g.fillRect");
}
endPerfLog("drawRect");
}
var numbers = {};
numbers.Hour = () => { return new Date().getHours(); };
numbers.HourTens = () => { return Math.floor(new Date().getHours()/10); };

4
apps/imageclock/custom.html
View File

@ -540,6 +540,8 @@
combineProperty("X",element,next);
combineProperty("Y",element,next);
combineProperty("Width",element,next);
combineProperty("Height",element,next);
combineProperty("HideOn",element,next);
combineProperty("Type",element,next);
combineProperty("ForegroundColor",element,next);
@ -550,7 +552,7 @@
combineProperty("MaxRotationValue",element,next);
next.Layer = element.Layer ? (element.Layer) : "" + c;
if (["MultiState","Image","CodedImage","Number","Poly","Scale"].includes(c)){
if (["MultiState","Image","CodedImage","Number","Poly","Rect","Scale"].includes(c)){
result.push({type:c, value: next});
} else {
result = result.concat(collapseTree(next));