code cleanup

84ddf10d2ae3661dc76c35c03ccda7d0889c2796 · por Emil Sjölander · 2018-12-17T19:34:49Z (hace 7 años) · padre 1163d1d6b · ver el árbol en este commit

Delta semántico · 1

src/algo.rs

cambió por dentro fn compute_internal

1 archivos · +6 −7

src/algo.rs +6 −7

diff --git a/src/algo.rs b/src/algo.rs
index a93946b69..7449a7ce2 100644
--- a/src/algo.rs
+++ b/src/algo.rs
@@ -1082,22 +1082,21 @@ fn compute_internal(
             let (start_main, end_main) = if is_row { (start, end) } else { (top, bottom) };
             let (start_cross, end_cross) = if is_row { (top, bottom) } else { (start, end) };
 
-            let child_width = child
+            let width = child
                 .size
                 .width
                 .resolve(container_width)
                 .maybe_max(child.min_size.width.resolve(container_width))
-                .maybe_min(child.max_size.width.resolve(container_width));
+                .maybe_min(child.max_size.width.resolve(container_width))
+                .or_else(container_width - start - end);
 
-            let child_height = child
+            let height = child
                 .size
                 .height
                 .resolve(container_height)
                 .maybe_max(child.min_size.height.resolve(container_height))
-                .maybe_min(child.max_size.height.resolve(container_height));
-
-            let width = child_width.or_else(container_width - start - end);
-            let height = child_height.or_else(container_height - top - bottom);
+                .maybe_min(child.max_size.height.resolve(container_height))
+                .or_else(container_height - top - bottom);
 
             let result = compute_internal(
                 child,