Merge pull request #25 from NativeScript/raikov/fix-docklayout-api17

Fixed: DockLayout in ScrollView returns wrong size on API 17
This commit is contained in:
tzraikov
2016-06-13 15:09:42 +03:00
committed by GitHub

View File

@@ -41,8 +41,8 @@ public class DockLayout extends LayoutBase {
int verticalPadding = this.getPaddingTop() + this.getPaddingBottom(); int verticalPadding = this.getPaddingTop() + this.getPaddingBottom();
int horizontalPadding = this.getPaddingLeft() + this.getPaddingRight(); int horizontalPadding = this.getPaddingLeft() + this.getPaddingRight();
int remainingWidth = widthMode == MeasureSpec.UNSPECIFIED ? Integer.MAX_VALUE : width - horizontalPadding; int remainingWidth = widthMode == MeasureSpec.UNSPECIFIED ? 0 : width - horizontalPadding;
int remainingHeight = heightMode == MeasureSpec.UNSPECIFIED ? Integer.MAX_VALUE : height - verticalPadding; int remainingHeight = heightMode == MeasureSpec.UNSPECIFIED ? 0 : height - verticalPadding;
int tempHeight = 0; int tempHeight = 0;
int tempWidth = 0; int tempWidth = 0;