diff --git a/src/core/wrapper/layout/adapt/adapt.horizontal.js b/src/core/wrapper/layout/adapt/adapt.horizontal.js
index 6c40432ee7..224422a45e 100644
--- a/src/core/wrapper/layout/adapt/adapt.horizontal.js
+++ b/src/core/wrapper/layout/adapt/adapt.horizontal.js
@@ -8,7 +8,6 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-adapt-layout",
verticalAlign: BI.VerticalAlign.Top,
- horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [],
scrollx: false,
hgap: 0,
@@ -24,8 +23,8 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
BI.HorizontalAdaptLayout.superclass.render.apply(this, arguments);
return {
type: "bi.horizontal",
- verticalAlign: BI.VerticalAlign.Top,
- horizontalAlign: o.horizontalAlign,
+ verticalAlign: o.verticalAlign,
+ horizontalAlign: BI.HorizontalAlign.Stretch,
columnSize: o.columnSize,
items: o.items,
scrollx: o.scrollx,
@@ -49,4 +48,4 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
this.layout.populate.apply(this, arguments);
}
});
-BI.shortcut("bi.horizontal_adapt", BI.HorizontalAdaptLayout);
\ No newline at end of file
+BI.shortcut("bi.horizontal_adapt", BI.HorizontalAdaptLayout);
diff --git a/src/core/wrapper/layout/adapt/adapt.table.js b/src/core/wrapper/layout/adapt/adapt.table.js
index ffd5655047..528432bb54 100644
--- a/src/core/wrapper/layout/adapt/adapt.table.js
+++ b/src/core/wrapper/layout/adapt/adapt.table.js
@@ -25,8 +25,8 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
this.$table = BI.Widget._renderEngine.createElement("
").css({
position: "relative",
display: "table",
- height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
- width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
+ width: (o.horizontalAlign === BI.HorizontalAlign.Center || BI.HorizontalAlign.Stretch) ? "100%" : "auto",
+ height: (o.verticalAlign === BI.VerticalAlign.Middle || o.verticalAlign === BI.VerticalAlign.Stretch) ? "100%" : "auto",
"white-space": "nowrap"
});
this.populate(this.options.items);
@@ -103,4 +103,4 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
-BI.shortcut("bi.table_adapt", BI.TableAdaptLayout);
\ No newline at end of file
+BI.shortcut("bi.table_adapt", BI.TableAdaptLayout);
diff --git a/src/core/wrapper/layout/adapt/inline.center.js b/src/core/wrapper/layout/adapt/inline.center.js
index dd5c791394..0dec3583b1 100644
--- a/src/core/wrapper/layout/adapt/inline.center.js
+++ b/src/core/wrapper/layout/adapt/inline.center.js
@@ -12,6 +12,7 @@ BI.InlineCenterAdaptLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.InlineLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-inline-center-adapt-layout",
+ horizontalAlign: BI.HorizontalAlign.Center,
hgap: 0,
vgap: 0,
lgap: 0,
@@ -25,7 +26,7 @@ BI.InlineCenterAdaptLayout = BI.inherit(BI.Layout, {
BI.InlineCenterAdaptLayout.superclass.render.apply(this, arguments);
this.element.css({
whiteSpace: "nowrap",
- textAlign: "center"
+ textAlign: o.horizontalAlign
});
this.populate(this.options.items);
},
@@ -83,4 +84,4 @@ BI.InlineCenterAdaptLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
-BI.shortcut("bi.inline_center_adapt", BI.InlineCenterAdaptLayout);
\ No newline at end of file
+BI.shortcut("bi.inline_center_adapt", BI.InlineCenterAdaptLayout);
diff --git a/src/core/wrapper/layout/adapt/inline.vertical.js b/src/core/wrapper/layout/adapt/inline.vertical.js
index 24736f8e68..17bb7ccab5 100644
--- a/src/core/wrapper/layout/adapt/inline.vertical.js
+++ b/src/core/wrapper/layout/adapt/inline.vertical.js
@@ -12,13 +12,13 @@ BI.InlineVerticalAdaptLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.InlineLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-inline-vertical-adapt-layout",
+ horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0,
vgap: 0,
lgap: 0,
rgap: 0,
tgap: 0,
- bgap: 0,
- horizontalAlign: "left"
+ bgap: 0
});
},
@@ -29,7 +29,7 @@ BI.InlineVerticalAdaptLayout = BI.inherit(BI.Layout, {
whiteSpace: "nowrap",
textAlign: o.horizontalAlign
});
- this.populate(this.options.items);
+ this.populate(o.items);
},
_addElement: function (i, item) {
@@ -47,7 +47,7 @@ BI.InlineVerticalAdaptLayout = BI.inherit(BI.Layout, {
}
if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
w.element.css({
- "margin-left": (i === 0 ? o.hgap : 0) + o.lgap + (item.lgap || 0) + (item.hgap || 0) +"px"
+ "margin-left": (i === 0 ? o.hgap : 0) + o.lgap + (item.lgap || 0) + (item.hgap || 0) + "px"
});
}
if (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {