From a64b197347d921521f16c2aacc31b7490839a704 Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Mon, 12 Feb 2024 21:12:36 +1300 Subject: [PATCH] Fix build after rebase --- bindings/c/src/style_enums.rs | 5 +++++ bindings/c/src/tree.rs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bindings/c/src/style_enums.rs b/bindings/c/src/style_enums.rs index b95cbb485..479bfb95d 100644 --- a/bindings/c/src/style_enums.rs +++ b/bindings/c/src/style_enums.rs @@ -93,6 +93,9 @@ impl From for TaffyPosition { pub enum TaffyOverflow { /// The automatic minimum size of this node as a flexbox/grid item should be based on the size of it's content. Visible, + /// The automatic minimum size of this node as a flexbox/grid item should be based on the size of its content. + /// Content that overflows this node should *not* contribute to the scroll region of its parent. + Clip, /// The automatic minimum size of this node as a flexbox/grid item should be `0`. Hidden, /// The automatic minimum size of this node as a flexbox/grid item should be `0`. Additionally, space should be reserved @@ -103,6 +106,7 @@ impl From for core::Overflow { fn from(input: TaffyOverflow) -> core::Overflow { match input { TaffyOverflow::Visible => core::Overflow::Visible, + TaffyOverflow::Clip => core::Overflow::Clip, TaffyOverflow::Hidden => core::Overflow::Hidden, TaffyOverflow::Scroll => core::Overflow::Scroll, } @@ -112,6 +116,7 @@ impl From for TaffyOverflow { fn from(input: core::Overflow) -> TaffyOverflow { match input { core::Overflow::Visible => TaffyOverflow::Visible, + core::Overflow::Clip => TaffyOverflow::Clip, core::Overflow::Hidden => TaffyOverflow::Hidden, core::Overflow::Scroll => TaffyOverflow::Scroll, } diff --git a/bindings/c/src/tree.rs b/bindings/c/src/tree.rs index 8ab0c2495..69f70fc3c 100644 --- a/bindings/c/src/tree.rs +++ b/bindings/c/src/tree.rs @@ -5,7 +5,7 @@ use super::{ use ::core::ffi::c_void; use taffy::prelude as core; use taffy::style::AvailableSpace; -use taffy::Taffy as CoreTaffy; +use taffy::TaffyTree as CoreTaffy; pub type TaffyMeasureFunction = extern "C" fn( width_measure_mode: TaffyMeasureMode,