Facebook/react-native
1
0 Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error from refactor of setMeasuredDimensionsIfEmptyOrFixedSize

Browse Source 
Reviewed By: gkassabli

Differential Revision: D4258254

fbshipit-source-id: e22e36e67260114081e483527fc7ce378f7f0df9
This commit is contained in:
Emil Sjolander authored and Facebook Github Bot committed 2016-12-01 07:28:30 -08:00
1 parent 81c8a3f2ea
commit 8117a029cb
2 files changed
+2659 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

React/CSSLayout/CSSLayout.c
+2657
View File
File diff suppressed because it is too large. Load diff
ReactCommon/CSSLayout/CSSLayout/CSSLayout.c
+2 -2
View File
@@ -1290,14 +1290,14 @@ static bool setMeasuredDimensionsIfEmptyOrFixedSize(const CSSNodeRef node,
node->layout.measuredDimensions[CSSDimensionWidth] =
boundAxis(node,
CSSFlexDirectionRow,
CSSValueIsUndefined(availableWidth) || availableWidth < 0
CSSValueIsUndefined(availableWidth) || (widthMeasureMode == CSSMeasureModeAtMost && availableWidth < 0)
? 0
: availableWidth - marginAxisRow);
node->layout.measuredDimensions[CSSDimensionHeight] =
boundAxis(node,
CSSFlexDirectionColumn,
CSSValueIsUndefined(availableHeight) || availableHeight < 0
CSSValueIsUndefined(availableHeight) || (heightMeasureMode == CSSMeasureModeAtMost && availableHeight < 0)
? 0
: availableHeight - marginAxisColumn);