tawasuyu

tawasuyu/taffy

A high performance rust-powered UI layout library

Rust 1100HTML 1031Markdown 12TOML 84455 Definitions

Fix divide by zero in main size determination

58ca3222baad3b5710af5476960caa6b5da0af5f · by Nico Burns · (3 years ago) · parent f6e420270 · browse the tree at this commit

Semantic delta · 1

src/compute/flexbox.rs

1 files · +1 −2

diff --git a/src/compute/flexbox.rs b/src/compute/flexbox.rs
index 13458ea4d..ba88eb606 100644
--- a/src/compute/flexbox.rs
+++ b/src/compute/flexbox.rs
@@ -902,8 +902,7 @@ fn determine_container_main_size(
                             if diff > 0.0 {
                                 diff / f32_max(1.0, item.flex_grow)
                             } else if diff < 0.0 {
-                                let scaled_shrink_factor = f32_max(1.0, item.flex_shrink) * item.inner_flex_basis;
-                                // let scaled_shrink_factor - f32_max(1.0, item.flex_shrink * item.inner_flex_basis);
+                                let scaled_shrink_factor = f32_max(1.0, item.flex_shrink * item.inner_flex_basis);
                                 diff / scaled_shrink_factor
                             } else {
                                 // We are assuming that diff is 0.0 here and that we haven't accidentally introduced a NaN