diff --git a/Cargo.toml b/Cargo.toml index 74195a21..16af9575 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -133,6 +133,7 @@ serde = { version = "1.0.219", features = ["derive"] } slotmap = "1.0.7" smol = { version = "2.0.2", optional = true } thiserror = "2.0.16" +taffy = { version = "0.9.1", features = ["grid"] } tokio = { version = "1.47.1", optional = true } tracing = "0.1.41" unicode-segmentation = "1.12" @@ -205,11 +206,6 @@ optional = true version = "0.11" optional = true -[dependencies.taffy] -git = "https://github.com/DioxusLabs/taffy" -rev = "7781c70" -features = ["grid"] - [workspace] members = [ "cosmic-config", diff --git a/src/widget/flex_row/layout.rs b/src/widget/flex_row/layout.rs index d781e4f9..720e4561 100644 --- a/src/widget/flex_row/layout.rs +++ b/src/widget/flex_row/layout.rs @@ -44,7 +44,7 @@ pub fn resolve( min_size: taffy::geometry::Size { width: length(max_size.width), - height: Dimension::Auto, + height: Dimension::auto(), }, align_items, @@ -71,7 +71,7 @@ pub fn resolve( let c_size = child_widget.size(); let (width, flex_grow, justify_self) = match c_size.width { Length::Fill | Length::FillPortion(_) => { - (Dimension::Auto, 1.0, Some(AlignItems::Stretch)) + (Dimension::auto(), 1.0, Some(AlignItems::Stretch)) } _ => (length(size.width), 0.0, None), }; @@ -82,15 +82,15 @@ pub fn resolve( min_size: taffy::geometry::Size { width: match min_item_width { Some(width) => length(size.width.min(width)), - None => Dimension::Auto, + None => Dimension::auto(), }, - height: Dimension::Auto, + height: Dimension::auto(), }, size: taffy::geometry::Size { width, height: match c_size.height { - Length::Fill | Length::FillPortion(_) => Dimension::Auto, + Length::Fill | Length::FillPortion(_) => Dimension::auto(), _ => length(size.height), }, }, diff --git a/src/widget/grid/layout.rs b/src/widget/grid/layout.rs index 6423c377..d1da68af 100644 --- a/src/widget/grid/layout.rs +++ b/src/widget/grid/layout.rs @@ -48,7 +48,7 @@ pub fn resolve( let c_size = child_widget.size(); let (width, flex_grow, justify_self) = match c_size.width { Length::Fill | Length::FillPortion(_) => { - (Dimension::Auto, 1.0, Some(AlignItems::Stretch)) + (Dimension::auto(), 1.0, Some(AlignItems::Stretch)) } _ => (length(size.width), 0.0, None), }; @@ -72,7 +72,7 @@ pub fn resolve( size: taffy::geometry::Size { width, height: match c_size.height { - Length::Fill | Length::FillPortion(_) => Dimension::Auto, + Length::Fill | Length::FillPortion(_) => Dimension::auto(), _ => length(size.height), }, },