Merge pull request #5601 from hieupham007/timob-16485

timob-16485: fix layout issue for horizontal scrollview
tidev · Apr 17, 2014 · 1b9b7f9 · 1b9b7f9
2 parents 2bd6e2f + d260bf2
commit 1b9b7f9
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollView.java
@@ -167,8 +167,8 @@ public TiVerticalScrollView(Context context, LayoutArrangement arrangement)
 			setScrollBarStyle(SCROLLBARS_INSIDE_OVERLAY);
 
 			layout = new TiScrollViewLayout(context, arrangement);
-			FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
-				ViewGroup.LayoutParams.FILL_PARENT);
+			FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+				ViewGroup.LayoutParams.MATCH_PARENT);
 			layout.setLayoutParams(params);
 			super.addView(layout, params);
 		}
@@ -272,8 +272,8 @@ public TiHorizontalScrollView(Context context, LayoutArrangement arrangement)
 			setScrollContainer(true);
 
 			layout = new TiScrollViewLayout(context, arrangement);
-			FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
-				ViewGroup.LayoutParams.FILL_PARENT);
+			FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+				ViewGroup.LayoutParams.MATCH_PARENT);
 			layout.setLayoutParams(params);
 			super.addView(layout, params);
 
@@ -456,14 +456,15 @@ public void processProperties(KrollDict d)
 
 		int type = TYPE_VERTICAL;
 		boolean deduced = false;
-
+		
 		if (d.containsKey(TiC.PROPERTY_WIDTH) && d.containsKey(TiC.PROPERTY_CONTENT_WIDTH)) {
 			Object width = d.get(TiC.PROPERTY_WIDTH);
 			Object contentWidth = d.get(TiC.PROPERTY_CONTENT_WIDTH);
 			if (width.equals(contentWidth) || showVerticalScrollBar) {
 				type = TYPE_VERTICAL;
 				deduced = true;
 			}
+
 		}
 
 		if (d.containsKey(TiC.PROPERTY_HEIGHT) && d.containsKey(TiC.PROPERTY_CONTENT_HEIGHT)) {
@@ -519,9 +520,12 @@ public void processProperties(KrollDict d)
 			((TiScrollViewLayout) scrollViewLayout).setCanCancelEvents(TiConvert.toBoolean(d, TiC.PROPERTY_CAN_CANCEL_EVENTS));
 		}
 
-		if (d.containsKey(TiC.PROPERTY_HORIZONTAL_WRAP)) {
-			scrollViewLayout.setEnableHorizontalWrap(TiConvert.toBoolean(d, TiC.PROPERTY_HORIZONTAL_WRAP));
+		boolean autoContentWidth = (scrollViewLayout.getContentProperty(TiC.PROPERTY_CONTENT_WIDTH) == scrollViewLayout.AUTO);
+		boolean wrap = !autoContentWidth;
+		if (d.containsKey(TiC.PROPERTY_HORIZONTAL_WRAP) && wrap) {
+			wrap = TiConvert.toBoolean(d, TiC.PROPERTY_HORIZONTAL_WRAP, true);			
 		}
+		scrollViewLayout.setEnableHorizontalWrap(wrap);
 
 		if (d.containsKey(TiC.PROPERTY_OVER_SCROLL_MODE)) {
 			if (Build.VERSION.SDK_INT >= 9) {