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

Layout now uses appRect (should be fine with the new polyFill)

master
Gordon Williams 2021-10-27 16:50:16 +01:00
parent d771a6a732
commit f87f0a19f4
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/Layout.js
View File

@ -80,7 +80,6 @@ function Layout(layout, options) {
this._l = this.l = layout; this._l = this.l = layout;
// Do we have >1 physical buttons? // Do we have >1 physical buttons?
this.physBtns = (process.env.HWVERSION==2) ? 1 : 3; this.physBtns = (process.env.HWVERSION==2) ? 1 : 3;
this.yOffset = Object.keys(global.WIDGETS).length ? 24 : 0;
options = options || {}; options = options || {};
this.lazy = options.lazy || false; this.lazy = options.lazy || false;
@ -131,7 +130,7 @@ function Layout(layout, options) {
if (this.b[btn].cb) this.b[btn].cb(e); if (this.b[btn].cb) this.b[btn].cb(e);
} }
// enough physical buttons // enough physical buttons
let btnHeight = Math.floor((g.getHeight()-this.yOffset) / this.physBtns); let btnHeight = Math.floor(Bangle.appRect.h / this.physBtns);
if (Bangle.btnWatch) Bangle.btnWatch.forEach(clearWatch); if (Bangle.btnWatch) Bangle.btnWatch.forEach(clearWatch);
Bangle.btnWatch = []; Bangle.btnWatch = [];
if (this.physBtns > 2 && buttons.length==1) if (this.physBtns > 2 && buttons.length==1)
@ -344,10 +343,6 @@ Layout.prototype.debug = function(l,c) {
}; };
Layout.prototype.update = function() { Layout.prototype.update = function() {
delete this.updateNeeded; delete this.updateNeeded;
var l = this._l;
var w = g.getWidth();
var y = this.yOffset;
var h = g.getHeight()-y;
// update sizes // update sizes
function updateMin(l) {"ram" function updateMin(l) {"ram"
cb[l.type](l); cb[l.type](l);
@ -396,18 +391,19 @@ Layout.prototype.update = function() {
if (l.filly == null && l.c.some(c=>c.filly)) l.filly = 1; if (l.filly == null && l.c.some(c=>c.filly)) l.filly = 1;
} }
}; };
var l = this._l;
updateMin(l); updateMin(l);
// center if (l.fillx || l.filly) { // fill all
if (l.fillx || l.filly) { l.w = Bangle.appRect.w;
l.w = w; l.h = Bangle.appRect.h;
l.h = h; l.x = Bangle.appRect.x;
l.x = 0; l.y = Bangle.appRect.y;
l.y = y; } else { // or center
} else {
l.w = l._w; l.w = l._w;
l.h = l._h; l.h = l._h;
l.x = (w-l.w)>>1; l.x = (Bangle.appRect.w-l.w)>>1;
l.y = y+((h-l.h)>>1); l.y = Bangle.appRect.y+((Bangle.appRect.h-l.h)>>1);
} }
// layout children // layout children
this.layout(l); this.layout(l);