Merge pull request #9076 from jquick-axway/TIMOB-24277-6_1_X

[6_1_X][TIMOB-24277] Android: Fix horizontal layout when using 'right' and ‘left’
tidev · May 24, 2017 · b7c07fd · b7c07fd
2 parents acb835a + 755a470
commit b7c07fd
Showing 1 changed file with 2 additions and 2 deletions.
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,14 @@ private void computeHorizontalLayoutPosition(TiCompositeLayout.LayoutParams para
             right = Math.min(right, layoutRight);
         }
 
-        if (optionRight != null) {
+        if (optionLeft == null && optionRight != null) {
             hpos[0] = layoutRight - left;
             hpos[1] = layoutRight - horiztonalLayoutPreviousRight;
         } else {
             hpos[0] = left;
             hpos[1] = right;
+            horizontalLayoutCurrentLeft = right;
         }
-        horizontalLayoutCurrentLeft = right;
 
         if (enableHorizontalWrap) {
             // Don't update row on the first iteration since we already do it