Skip to content

Commit 73ae558

Browse files
committed
Fix competing nested shrink-wrapping stacks calculating their sizes based on their basic box instead of their outer boxes.
1 parent 07b5c38 commit 73ae558

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lib/src/utils/utils.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ BaseNode? getWidestNode(Iterable<BaseNode> siblings) {
194194

195195
// If both siblings have alignment or both do not have alignment, compare
196196
// their widths.
197-
return a.basicBoxLocal.width > b.basicBoxLocal.width ? a : b;
197+
return a.outerBoxLocal.width > b.outerBoxLocal.width ? a : b;
198198
});
199199
}
200200

@@ -216,7 +216,7 @@ BaseNode? getTallestNode(Iterable<BaseNode> siblings) {
216216

217217
// If both siblings have alignment or both do not have alignment, compare
218218
// their heights.
219-
return a.basicBoxLocal.height > b.basicBoxLocal.height ? a : b;
219+
return a.outerBoxLocal.height > b.outerBoxLocal.height ? a : b;
220220
});
221221
}
222222

@@ -235,19 +235,19 @@ BaseNode? getLargestNodeForWrappingStack(
235235
// Only horizontal wrap.
236236
if (parent.isHorizontalWrap && !parent.isVerticalWrap) {
237237
return sibling.reduce(
238-
(a, b) => a.basicBoxLocal.width > b.basicBoxLocal.width ? a : b);
238+
(a, b) => a.outerBoxLocal.width > b.outerBoxLocal.width ? a : b);
239239
}
240240

241241
// Only vertical wrap, compare heights.
242242
if (parent.isVerticalWrap && !parent.isHorizontalWrap) {
243243
return sibling.reduce(
244-
(a, b) => a.basicBoxLocal.height > b.basicBoxLocal.height ? a : b);
244+
(a, b) => a.outerBoxLocal.height > b.outerBoxLocal.height ? a : b);
245245
}
246246

247247
// Both wrap.
248248
return sibling.reduce((a, b) =>
249-
a.basicBoxLocal.height * a.basicBoxLocal.width >
250-
b.basicBoxLocal.height * b.basicBoxLocal.width
249+
a.outerBoxLocal.height * a.outerBoxLocal.width >
250+
b.outerBoxLocal.height * b.outerBoxLocal.width
251251
? a
252252
: b);
253253
}

0 commit comments

Comments
 (0)