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

Layout: only set fillxy/y if null 

Fixes #820
master
Ben Whittaker 2021-09-23 22:21:32 -04:00
parent 16fe84704b
commit 807ac743fc
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/Layout.js
View File

@ -329,14 +329,14 @@ Layout.prototype.update = function() {
l.c.forEach(updateMin); l.c.forEach(updateMin);
l._h = l.c.reduce((a,b)=>Math.max(a,b._h+(b.pad<<1)),0); l._h = l.c.reduce((a,b)=>Math.max(a,b._h+(b.pad<<1)),0);
l._w = l.c.reduce((a,b)=>a+b._w+(b.pad<<1),0); l._w = l.c.reduce((a,b)=>a+b._w+(b.pad<<1),0);
if (l.c.some(c=>c.fillx)) l.fillx = 1; if (l.fillx == null && l.c.some(c=>c.fillx)) l.fillx = 1;
if (l.c.some(c=>c.filly)) l.filly = 1; if (l.filly == null && l.c.some(c=>c.filly)) l.filly = 1;
}, "v": function(l) { }, "v": function(l) {
l.c.forEach(updateMin); l.c.forEach(updateMin);
l._h = l.c.reduce((a,b)=>a+b._h+(b.pad<<1),0); l._h = l.c.reduce((a,b)=>a+b._h+(b.pad<<1),0);
l._w = l.c.reduce((a,b)=>Math.max(a,b._w+(b.pad<<1)),0); l._w = l.c.reduce((a,b)=>Math.max(a,b._w+(b.pad<<1)),0);
if (l.c.some(c=>c.fillx)) l.fillx = 1; if (l.fillx == null && l.c.some(c=>c.fillx)) l.fillx = 1;
if (l.c.some(c=>c.filly)) l.filly = 1; if (l.filly == null && l.c.some(c=>c.filly)) l.filly = 1;
} }
}; };
updateMin(l); updateMin(l);

BIN
tests/Layout/tests/filly_issue820.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

9
tests/Layout/tests/filly_issue820.js Normal file
View File

@ -0,0 +1,9 @@
g.clear();
var layout = new Layout({type:"h", filly: 0, c: [
{type: "txt", font: "50%", label: "A"},
{type:"v", c: [
{type: "txt", font: "10%", label: "B"},
{filly: 1},
{type: "txt", font: "10%", label: "C"},
]},
]});