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

Optimization

pull/809/head
Ben Whittaker 2021-09-15 19:53:35 -04:00
parent 74e739d019
commit 0c4ac74214
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/Layout.js
View File

@ -248,13 +248,11 @@ function prepareLazyRender(l, rectsToClear, drawList, rects, bgCol) {
// Hash the layoutObject without including its children // Hash the layoutObject without including its children
let c = l.c; let c = l.c;
delete l.c; delete l.c;
let hash = E.CRC32(E.toJS(l)); let hash = "H"+E.CRC32(E.toJS(l)); // String keys maintain insertion order
if (c) l.c = c; if (c) l.c = c;
let i = rectsToClear.findIndex(r => r.h == hash); if (!delete rectsToClear[hash]) {
if (i != -1) rectsToClear.splice(i, 1); rects[hash] = {bg: bgCol, r: [l.x,l.y,l.x+l.w-1,l.y+l.h-1]};
else {
rects.push({h: hash, bg: bgCol, x1: l.x, y1: l.y, x2: l.x+l.w-1, y2: l.y+l.h-1});
if (drawList) { if (drawList) {
drawList.push(l); drawList.push(l);
drawList = null; // Prevent children from being redundantly added to the drawList drawList = null; // Prevent children from being redundantly added to the drawList
@ -269,13 +267,13 @@ Layout.prototype.render = function (l) {
if (!l) l = this._l; if (!l) l = this._l;
if (this.lazy) { if (this.lazy) {
if (!this.rects) this.rects = []; if (!this.rects) this.rects = {};
let rectsToClear = this.rects.slice(); let rectsToClear = this.rects.clone();
let drawList = []; let drawList = [];
prepareLazyRender(l, rectsToClear, drawList, this.rects, g.getBgColor()); prepareLazyRender(l, rectsToClear, drawList, this.rects, g.getBgColor());
this.rects = this.rects.filter(r1 => !rectsToClear.some(r2 => r1.h == r2.h)); for (let h in rectsToClear) delete this.rects[h];
rectsToClear.reverse(); // Rects are cleared in reverse order so that the original bg color is restored let clearList = Object.keys(rectsToClear).map(k=>rectsToClear[k]).reverse(); // Rects are cleared in reverse order so that the original bg color is restored
for (let r of rectsToClear) g.setBgColor(r.bg).clearRect(r.x1, r.y1, r.x2, r.y2); for (let r of clearList) g.setBgColor(r.bg).clearRect.apply(g, r.r);
drawList.forEach(render); drawList.forEach(render);
} }
else { else {

18
modules/Layout.min.js vendored
View File

@ -248,13 +248,11 @@ function prepareLazyRender(l, rectsToClear, drawList, rects, bgCol) {
// Hash the layoutObject without including its children // Hash the layoutObject without including its children
let c = l.c; let c = l.c;
delete l.c; delete l.c;
let hash = E.CRC32(E.toJS(l)); let hash = "H"+E.CRC32(E.toJS(l)); // String keys maintain insertion order
if (c) l.c = c; if (c) l.c = c;
let i = rectsToClear.findIndex(r => r.h == hash); if (!delete rectsToClear[hash]) {
if (i != -1) rectsToClear.splice(i, 1); rects[hash] = {bg: bgCol, r: [l.x,l.y,l.x+l.w-1,l.y+l.h-1]};
else {
rects.push({h: hash, bg: bgCol, x1: l.x, y1: l.y, x2: l.x+l.w-1, y2: l.y+l.h-1});
if (drawList) { if (drawList) {
drawList.push(l); drawList.push(l);
drawList = null; // Prevent children from being redundantly added to the drawList drawList = null; // Prevent children from being redundantly added to the drawList
@ -269,13 +267,13 @@ Layout.prototype.render = function (l) {
if (!l) l = this._l; if (!l) l = this._l;
if (this.lazy) { if (this.lazy) {
if (!this.rects) this.rects = []; if (!this.rects) this.rects = {};
let rectsToClear = this.rects.slice(); let rectsToClear = this.rects.clone();
let drawList = []; let drawList = [];
prepareLazyRender(l, rectsToClear, drawList, this.rects, g.getBgColor()); prepareLazyRender(l, rectsToClear, drawList, this.rects, g.getBgColor());
this.rects = this.rects.filter(r1 => !rectsToClear.some(r2 => r1.h == r2.h)); for (let h in rectsToClear) delete this.rects[h];
rectsToClear.reverse(); // Rects are cleared in reverse order so that the original bg color is restored let clearList = Object.keys(rectsToClear).map(k=>rectsToClear[k]).reverse(); // Rects are cleared in reverse order so that the original bg color is restored
for (let r of rectsToClear) g.setBgColor(r.bg).clearRect(r.x1, r.y1, r.x2, r.y2); for (let r of clearList) g.setBgColor(r.bg).clearRect.apply(g, r.r);
drawList.forEach(render); drawList.forEach(render);
} }
else { else {