[gui] fix TailLayout margin

This commit is contained in:
2019-03-25 16:01:16 +03:00
parent 9fb1c1405f
commit ad504de290

View File

@@ -36,6 +36,7 @@ class TailLayout extends DefaultLayout {
(rowSize > 0 && row.views.length >= rowSize) || (rowSize > 0 && row.views.length >= rowSize) ||
(rowSize == 0 && row.width + view.width + margin + group.geometry.margin.horizontal > group.width) (rowSize == 0 && row.width + view.width + margin + group.geometry.margin.horizontal > group.width)
) { ) {
row.width -= margin;
w = Math.max(w, row.width); w = Math.max(w, row.width);
rows.push(row); rows.push(row);
row = { row = {
@@ -48,6 +49,7 @@ class TailLayout extends DefaultLayout {
row.width += view.width + margin; row.width += view.width + margin;
row.height = Math.max(row.height, view.height); row.height = Math.max(row.height, view.height);
} }
row.width -= margin;
w = Math.max(w, row.width); w = Math.max(w, row.width);
rows.push(row); rows.push(row);
var h:Float = Lambda.fold(rows, function(row, h) return row.height + h, 0) + margin * (rows.length - 1); var h:Float = Lambda.fold(rows, function(row, h) return row.height + h, 0) + margin * (rows.length - 1);