Skip to content

Commit

Permalink
Fix build after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoburns committed Feb 12, 2024
1 parent a0820e6 commit a64b197
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions bindings/c/src/style_enums.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ impl From<core::Position> 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
Expand All @@ -103,6 +106,7 @@ impl From<TaffyOverflow> 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,
}
Expand All @@ -112,6 +116,7 @@ impl From<core::Overflow> 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,
}
Expand Down
2 changes: 1 addition & 1 deletion bindings/c/src/tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit a64b197

Please sign in to comment.