* [Android] Fix text height problem. (#1408)

Fix the following case http://dotwe.org/vue/cf3151b4998e8f5c7adda9a85b47d864 http://dotwe.org/vue/42176496c85d43b2016513588eeb6b10 http://dotwe.org/vue/55014cc3ada41e048ac0f90c1454096a
apache · Aug 9, 2018 · 42046b0 · 42046b0
1 parent 776bc45
commit 42046b0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/weex_core/Source/core/layout/layout.cpp b/weex_core/Source/core/layout/layout.cpp
@@ -338,9 +338,11 @@ namespace WeexCore {
           child->hypotheticalMeasure(childWidth, childHeight, stretch);
         } else {
           if(isSingleFlexLine(isMainAxisHorizontal(this) ? parentWidth : parentHeight)
-              && !isMainAxisHorizontal(this) && child->widthMeasureMode == kUnspecified){
-            child->setLayoutWidth(parentWidth - sumPaddingBorderAlongAxis(this, true)
-                                      -child->mCssStyle->sumMarginOfDirection(true));
+              && !isMainAxisHorizontal(this)){
+            if(child->widthMeasureMode == kUnspecified) {
+              child->setLayoutWidth(parentWidth - sumPaddingBorderAlongAxis(this, true)
+                                        - child->mCssStyle->sumMarginOfDirection(true));
+            }
             if(child->heightMeasureMode == kUnspecified && child->widthDirty) {
               child->mLayoutResult->mLayoutSize.height = NAN;
             }