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

Layout: remove 'fsz' hack as any firmware 2v11+ will support font size in the string now

pull/1502/head
Gordon Williams 2022-02-23 10:45:18 +00:00
parent ffa5b96de6
commit 17b7d85950
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/Layout.js
View File

@ -180,13 +180,6 @@ function Layout(layout, options) {
if (l.id) ll[l.id] = l;
// fix type up
if (!l.type) l.type="";
// FIXME ':'/fsz not needed in new firmwares - Font:12 is handled internally
// fix fonts for pre-2v11 firmware
if (l.font && l.font.includes(":")) {
var f = l.font.split(":");
l.font = f[0];
l.fsz = f[1];
}
if (l.c) l.c.forEach(recurser);
}
recurser(this._l);
@ -241,13 +234,13 @@ Layout.prototype.render = function (l) {
"":function(){},
"txt":function(l){
if (l.wrap) {
g.setFont(l.font,l.fsz).setFontAlign(0,-1);
g.setFont(l.font).setFontAlign(0,-1);
var lines = g.wrapString(l.label, l.w);
var y = l.y+((l.h-g.getFontHeight()*lines.length)>>1);
// TODO: on 2v11 we can just render in a single drawString call
lines.forEach((line, i) => g.drawString(line, l.x+(l.w>>1), y+g.getFontHeight()*i));
} else {
g.setFont(l.font,l.fsz).setFontAlign(0,0,l.r).drawString(l.label, l.x+(l.w>>1), l.y+(l.h>>1));
g.setFont(l.font).setFontAlign(0,0,l.r).drawString(l.label, l.x+(l.w>>1), l.y+(l.h>>1));
}
}, "btn":function(l){
var x = l.x+(0|l.pad), y = l.y+(0|l.pad),
@ -365,7 +358,7 @@ Layout.prototype.update = function() {
if (l.wrap) {
l._h = l._w = 0;
} else {
var m = g.setFont(l.font,l.fsz).stringMetrics(l.label);
var m = g.setFont(l.font).stringMetrics(l.label);
l._w = m.width; l._h = m.height;
}
}, "btn": function(l) {