YorkShen closed pull request #1344: * [Core] Fix "flex-grow" problem on text
URL: https://github.com/apache/incubator-weex/pull/1344
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/weex_core/Source/core/layout/layout.cpp
b/weex_core/Source/core/layout/layout.cpp
index eeac11c847..f2d944ee50 100644
--- a/weex_core/Source/core/layout/layout.cpp
+++ b/weex_core/Source/core/layout/layout.cpp
@@ -467,6 +467,11 @@ namespace WeexCore {
if (isMainAxisHorizontal(this)) {
child->setWidthMeasureMode(kExactly);
child->setLayoutWidth(childMainSize);
+ //TODO Fix
https://jsplayground.taobao.org/raxplayground/97efee70-775f-45a6-b07d-d84c8d1b4387
+ //TODO This is just a temporary fix, we need to make things beauty and
clean.
+ if(child->heightMeasureMode == kUnspecified && child->measureFunc !=
nullptr && child->getChildCount() == 0){
+ child->setLayoutHeight(NAN);
+ }
} else {
child->setHeightMeasureMode(kExactly);
child->setLayoutHeight(childMainSize);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
