status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix row height 

Reviewed By: @frantic

Differential Revision: D2480265
This commit is contained in:
Christopher Chedeau 2015-09-25 11:13:42 -07:00 committed by facebook-github-bot-7
parent 1487ebfe01
commit ec8b5425e5
2 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
React/Layout/Layout.c
View File

@ -1004,7 +1004,7 @@ static void layoutNodeImpl(css_node_t *node, float parentMaxWidth, css_direction
if (alignItem == CSS_ALIGN_STRETCH) { if (alignItem == CSS_ALIGN_STRETCH) {
// You can only stretch if the dimension has not already been set // You can only stretch if the dimension has not already been set
// previously. // previously.
if (isUndefined(child->layout.dimensions[dim[crossAxis]])) { if (!isDimDefined(child, crossAxis)) {
child->layout.dimensions[dim[crossAxis]] = fmaxf( child->layout.dimensions[dim[crossAxis]] = fmaxf(
boundAxis(child, crossAxis, containerCrossAxis - boundAxis(child, crossAxis, containerCrossAxis -
paddingAndBorderAxisCross - getMarginAxis(child, crossAxis)), paddingAndBorderAxisCross - getMarginAxis(child, crossAxis)),

4
ReactAndroid/src/main/java/com/facebook/csslayout/LayoutEngine.java
View File

@ -7,7 +7,7 @@
*/ */
// NOTE: this file is auto-copied from https://github.com/facebook/css-layout // NOTE: this file is auto-copied from https://github.com/facebook/css-layout
// @generated SignedSource<<e7c34406ea5072e4584a2b054ab56d9f>> // @generated SignedSource<<4cabe0d63a4ed878edf6b5be8762746a>>
package com.facebook.csslayout; package com.facebook.csslayout;
@ -699,7 +699,7 @@ public class LayoutEngine {
if (alignItem == CSSAlign.STRETCH) { if (alignItem == CSSAlign.STRETCH) {
// You can only stretch if the dimension has not already been set // You can only stretch if the dimension has not already been set
// previously. // previously.
if (Float.isNaN(child.layout.dimensions[dim[crossAxis]])) { if (!(!Float.isNaN(child.style.dimensions[dim[crossAxis]]) && child.style.dimensions[dim[crossAxis]] > 0.0)) {
child.layout.dimensions[dim[crossAxis]] = Math.max( child.layout.dimensions[dim[crossAxis]] = Math.max(
boundAxis(child, crossAxis, containerCrossAxis - boundAxis(child, crossAxis, containerCrossAxis -
paddingAndBorderAxisCross - (child.style.margin.getWithFallback(leadingSpacing[crossAxis], leading[crossAxis]) + child.style.margin.getWithFallback(trailingSpacing[crossAxis], trailing[crossAxis]))), paddingAndBorderAxisCross - (child.style.margin.getWithFallback(leadingSpacing[crossAxis], leading[crossAxis]) + child.style.margin.getWithFallback(trailingSpacing[crossAxis], trailing[crossAxis]))),