[TIMOB-24792] Fix horizontal layout

tidev · Jun 8, 2017 · ff31cfc · ff31cfc
1 parent 2ddb13b
commit ff31cfc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListItem.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListItem.java
@@ -38,7 +38,9 @@ public TiListItem(TiViewProxy proxy, LayoutParams p, View v, View item_layout) {
 	}
 
 	public void processProperties(KrollDict d) {
-
+		if (d.containsKey(TiC.PROPERTY_LAYOUT)) {
+			d.remove(TiC.PROPERTY_LAYOUT);
+		}
 		if (d.containsKey(TiC.PROPERTY_ACCESSORY_TYPE)) {
 			int accessory = TiConvert.toInt(d.get(TiC.PROPERTY_ACCESSORY_TYPE), -1);
 			handleAccessory(accessory);

diff --git a/android/titanium/src/java/org/appcelerator/titanium/view/TiCompositeLayout.java b/android/titanium/src/java/org/appcelerator/titanium/view/TiCompositeLayout.java
@@ -731,14 +731,9 @@ private void computeHorizontalLayoutPosition(TiCompositeLayout.LayoutParams para
             right = Math.min(right, layoutRight);
         }
 
-        if (optionLeft == null && optionRight != null) {
-            hpos[0] = layoutRight - left;
-            hpos[1] = layoutRight - horiztonalLayoutPreviousRight;
-        } else {
-            hpos[0] = left;
-            hpos[1] = right;
-            horizontalLayoutCurrentLeft = right;
-        }
+        hpos[0] = left;
+        hpos[1] = right;
+        horizontalLayoutCurrentLeft = right;
 
         if (enableHorizontalWrap) {
             // Don't update row on the first iteration since we already do it