Skip to content

Commit a64b197

Browse files
committed
Fix build after rebase
1 parent a0820e6 commit a64b197

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

bindings/c/src/style_enums.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ impl From<core::Position> for TaffyPosition {
9393
pub enum TaffyOverflow {
9494
/// The automatic minimum size of this node as a flexbox/grid item should be based on the size of it's content.
9595
Visible,
96+
/// The automatic minimum size of this node as a flexbox/grid item should be based on the size of its content.
97+
/// Content that overflows this node should *not* contribute to the scroll region of its parent.
98+
Clip,
9699
/// The automatic minimum size of this node as a flexbox/grid item should be `0`.
97100
Hidden,
98101
/// 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<TaffyOverflow> for core::Overflow {
103106
fn from(input: TaffyOverflow) -> core::Overflow {
104107
match input {
105108
TaffyOverflow::Visible => core::Overflow::Visible,
109+
TaffyOverflow::Clip => core::Overflow::Clip,
106110
TaffyOverflow::Hidden => core::Overflow::Hidden,
107111
TaffyOverflow::Scroll => core::Overflow::Scroll,
108112
}
@@ -112,6 +116,7 @@ impl From<core::Overflow> for TaffyOverflow {
112116
fn from(input: core::Overflow) -> TaffyOverflow {
113117
match input {
114118
core::Overflow::Visible => TaffyOverflow::Visible,
119+
core::Overflow::Clip => TaffyOverflow::Clip,
115120
core::Overflow::Hidden => TaffyOverflow::Hidden,
116121
core::Overflow::Scroll => TaffyOverflow::Scroll,
117122
}

bindings/c/src/tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use super::{
55
use ::core::ffi::c_void;
66
use taffy::prelude as core;
77
use taffy::style::AvailableSpace;
8-
use taffy::Taffy as CoreTaffy;
8+
use taffy::TaffyTree as CoreTaffy;
99

1010
pub type TaffyMeasureFunction = extern "C" fn(
1111
width_measure_mode: TaffyMeasureMode,

0 commit comments

Comments
 (0)