DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Fixed spacing for wrapped elements #85

Merged
nicklockwood merged 2 commits from master into master 2015-05-13 18:10:34 -07:00
Conversation 0 Commits 2 Files Changed 6 +184
6 changed files with 184 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9175721f07 - Show all commits

2
src/Layout.c
View File

@@ -624,7 +624,7 @@ static void layoutNodeImpl(css_node_t *node, float parentMaxWidth, css_direction
// If there's only one element, then it's bigger than the content // If there's only one element, then it's bigger than the content
// and needs its own line // and needs its own line
i != startLine) { i != startLine) {
nonFlexibleChildrenCount --; nonFlexibleChildrenCount--;
alreadyComputedNextLayout = 1; alreadyComputedNextLayout = 1;
break; break;
} }

2
src/Layout.js
View File

@@ -520,7 +520,7 @@ var computeLayout = (function() {
// If there's only one element, then it's bigger than the content // If there's only one element, then it's bigger than the content
// and needs its own line // and needs its own line
i !== startLine) { i !== startLine) {
nonFlexibleChildrenCount --; nonFlexibleChildrenCount--;
alreadyComputedNextLayout = 1; alreadyComputedNextLayout = 1;
break; break;
} }

2
src/java/src/com/facebook/csslayout/LayoutEngine.java
View File

@@ -609,7 +609,7 @@ public class LayoutEngine {
// If there's only one element, then it's bigger than the content // If there's only one element, then it's bigger than the content
// and needs its own line // and needs its own line
i != startLine) { i != startLine) {
nonFlexibleChildrenCount --; nonFlexibleChildrenCount--;
alreadyComputedNextLayout = 1; alreadyComputedNextLayout = 1;
break; break;
} }