Skip to content

Commit

Permalink
Bump taffy
Browse files Browse the repository at this point in the history
Signed-off-by: Nico Burns <[email protected]>
  • Loading branch information
nicoburns committed Feb 20, 2025
1 parent 41092b7 commit e52f685
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dioxus-core = { version = "0.6" }
dioxus-html = { version = "0.6" }
dioxus-cli-config = { version = "0.6" }
dioxus-devtools = { version = "0.6" }
taffy = { git = "https://github.com/dioxuslabs/taffy", rev = "51e21564", default-features = false, features = ["std", "flexbox", "grid", "block_layout", "content_size"] }
taffy = { git = "https://github.com/dioxuslabs/taffy", rev = "8437796c", default-features = false, features = ["std", "flexbox", "grid", "block_layout", "content_size", "calc"] }

# Linebender + WGPU + SVG
color = "0.2"
Expand Down
9 changes: 4 additions & 5 deletions packages/blitz-dom/src/layout/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ pub(crate) mod table;
use self::replaced::{replaced_measure_function, ReplacedContext};
use self::table::TableTreeWrapper;

pub(crate) fn resolve_calc_value(calc_value: u64, parent_size: f32) -> f32 {
let calc_ptr = calc_value as usize as *const CalcLengthPercentage;
let calc = unsafe { &*calc_ptr };
pub(crate) fn resolve_calc_value(calc_ptr: *const (), parent_size: f32) -> f32 {
let calc = unsafe { &*(calc_ptr as *const CalcLengthPercentage) };
calc.resolve(CSSPixelLength::new(parent_size)).px()
}

Expand Down Expand Up @@ -85,8 +84,8 @@ impl LayoutPartialTree for BaseDocument {
self.node_from_id_mut(node_id).unrounded_layout = *layout;
}

fn resolve_calc_value(&self, calc_value: u64, parent_size: f32) -> f32 {
resolve_calc_value(calc_value, parent_size)
fn resolve_calc_value(&self, calc_ptr: *const (), parent_size: f32) -> f32 {
resolve_calc_value(calc_ptr, parent_size)
}

fn compute_child_layout(
Expand Down
4 changes: 2 additions & 2 deletions packages/blitz-dom/src/layout/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ impl taffy::LayoutPartialTree for TableTreeWrapper<'_> {
&self.ctx.style
}

fn resolve_calc_value(&self, calc_value: u64, parent_size: f32) -> f32 {
resolve_calc_value(calc_value, parent_size)
fn resolve_calc_value(&self, calc_ptr: *const (), parent_size: f32) -> f32 {
resolve_calc_value(calc_ptr, parent_size)
}

fn set_unrounded_layout(&mut self, node_id: taffy::NodeId, layout: &taffy::Layout) {
Expand Down

0 comments on commit e52f685

Please sign in to comment.