From 194c12af9d3972a928ed1fa6f5768ac0b27f72bb Mon Sep 17 00:00:00 2001 From: Tsvetan Raikov Date: Mon, 13 Jun 2016 12:23:13 +0300 Subject: [PATCH] Fixed: DockLayout in ScrollView returns wrong size on API 17 --- .../src/main/java/org/nativescript/widgets/DockLayout.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/widgets/src/main/java/org/nativescript/widgets/DockLayout.java b/android/widgets/src/main/java/org/nativescript/widgets/DockLayout.java index 6e7724091..979c4f702 100644 --- a/android/widgets/src/main/java/org/nativescript/widgets/DockLayout.java +++ b/android/widgets/src/main/java/org/nativescript/widgets/DockLayout.java @@ -41,8 +41,8 @@ public class DockLayout extends LayoutBase { int verticalPadding = this.getPaddingTop() + this.getPaddingBottom(); int horizontalPadding = this.getPaddingLeft() + this.getPaddingRight(); - int remainingWidth = widthMode == MeasureSpec.UNSPECIFIED ? Integer.MAX_VALUE : width - horizontalPadding; - int remainingHeight = heightMode == MeasureSpec.UNSPECIFIED ? Integer.MAX_VALUE : height - verticalPadding; + int remainingWidth = widthMode == MeasureSpec.UNSPECIFIED ? 0 : width - horizontalPadding; + int remainingHeight = heightMode == MeasureSpec.UNSPECIFIED ? 0 : height - verticalPadding; int tempHeight = 0; int tempWidth = 0;