guy 3 years ago
parent
commit
23aced351b
  1. 2
      src/core/wrapper/layout/flex/flex.horizontal.js
  2. 2
      src/core/wrapper/layout/flex/flex.vertical.js
  3. 2
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
  4. 2
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js

2
src/core/wrapper/layout/flex/flex.horizontal.js

@ -34,11 +34,13 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
w.element.css({
position: "relative"
});
if (o.columnSize[i] !== "auto") {
if (o.horizontalAlign === BI.HorizontalAlign.Stretch && o.columnSize[i] !== "") {
w.element.addClass("fill");
} else {
w.element.addClass("shrink-none");
}
}
if (o.columnSize[i] > 0) {
w.element.width(o.columnSize[i] <= 1 ? (o.columnSize[i] * 100 + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit));
}

2
src/core/wrapper/layout/flex/flex.vertical.js

@ -33,11 +33,13 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
w.element.css({
position: "relative"
});
if (o.rowSize[i] !== "auto") {
if (o.verticalAlign === BI.VerticalAlign.Stretch && o.rowSize[i] !== "") {
w.element.addClass("fill");
} else {
w.element.addClass("shrink-none");
}
}
if (o.rowSize[i] > 0) {
w.element.height(o.rowSize[i] <= 1 ? (o.rowSize[i] * 100 + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit));
}

2
src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js

@ -35,11 +35,13 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
w.element.css({
position: "relative"
});
if (o.columnSize[i] !== "auto") {
if (o.horizontalAlign === BI.HorizontalAlign.Stretch && o.columnSize[i] !== "") {
w.element.addClass("fill");
} else {
w.element.addClass("shrink-none");
}
}
if (o.columnSize[i] > 0) {
w.element.width(o.columnSize[i] <= 1 ? (o.columnSize[i] * 100 + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit));
}

2
src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js

@ -35,11 +35,13 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
w.element.css({
position: "relative"
});
if (o.rowSize[i] !== "auto") {
if (o.verticalAlign === BI.VerticalAlign.Stretch && o.rowSize[i] !== "") {
w.element.addClass("fill");
} else {
w.element.addClass("shrink-none");
}
}
if (o.rowSize[i] > 0) {
w.element.height(o.rowSize[i] <= 1 ? (o.rowSize[i] * 100 + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit));
}

Loading…
Cancel
Save