Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "chore: Bump taffy version to 0.4.3" (#11622)

Browse source 
Reverts zed-industries/zed#11606
This commit is contained in:
Piotr Osiewicz 2024-05-09 19:11:37 +02:00 • committed by GitHub
parent 5fe4070501
commit f0af508ae5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Cargo.lock generated
View file

@ -4674,9 +4674,9 @@ dependencies = [
[[package]] [[package]]
name = "grid" name = "grid"
version = "0.13.0" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d196ffc1627db18a531359249b2bf8416178d84b729f3cebeb278f285fb9b58c" checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9"
[[package]] [[package]]
name = "group" name = "group"
@ -9920,14 +9920,12 @@ dependencies = [
[[package]] [[package]]
name = "taffy" name = "taffy"
version = "0.4.3" version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/DioxusLabs/taffy?rev=1876f72bee5e376023eaa518aa7b8a34c769bd1b#1876f72bee5e376023eaa518aa7b8a34c769bd1b"
checksum = "7b2e140b328c6cb5e744bb2c65910b47df86b239afc793ee2c52262569cf9225"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"grid", "grid",
"num-traits", "num-traits",
"serde",
"slotmap", "slotmap",
] ]

2
crates/gpui/Cargo.toml
View file

@ -61,7 +61,7 @@ slotmap = "1.0.6"
smallvec.workspace = true smallvec.workspace = true
smol.workspace = true smol.workspace = true
sum_tree.workspace = true sum_tree.workspace = true
taffy = "0.4.3" taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "1876f72bee5e376023eaa518aa7b8a34c769bd1b" }
thiserror.workspace = true thiserror.workspace = true
time.workspace = true time.workspace = true
util.workspace = true util.workspace = true

8
crates/gpui/src/taffy.rs
View file

@ -9,14 +9,14 @@ use taffy::{
geometry::{Point as TaffyPoint, Rect as TaffyRect, Size as TaffySize}, geometry::{Point as TaffyPoint, Rect as TaffyRect, Size as TaffySize},
style::AvailableSpace as TaffyAvailableSpace, style::AvailableSpace as TaffyAvailableSpace,
tree::NodeId, tree::NodeId,
TaffyTree, TraversePartialTree as _, Taffy,
}; };
type NodeMeasureFn = type NodeMeasureFn =
Box<dyn FnMut(Size<Option<Pixels>>, Size<AvailableSpace>, &mut WindowContext) -> Size<Pixels>>; Box<dyn FnMut(Size<Option<Pixels>>, Size<AvailableSpace>, &mut WindowContext) -> Size<Pixels>>;
pub struct TaffyLayoutEngine { pub struct TaffyLayoutEngine {
taffy: TaffyTree<()>, taffy: Taffy,
styles: FxHashMap<LayoutId, Style>, styles: FxHashMap<LayoutId, Style>,
children_to_parents: FxHashMap<LayoutId, LayoutId>, children_to_parents: FxHashMap<LayoutId, LayoutId>,
absolute_layout_bounds: FxHashMap<LayoutId, Bounds<Pixels>>, absolute_layout_bounds: FxHashMap<LayoutId, Bounds<Pixels>>,
@ -29,7 +29,7 @@ static EXPECT_MESSAGE: &str = "we should avoid taffy layout errors by constructi
impl TaffyLayoutEngine { impl TaffyLayoutEngine {
pub fn new() -> Self { pub fn new() -> Self {
TaffyLayoutEngine { TaffyLayoutEngine {
taffy: TaffyTree::new(), taffy: Taffy::new(),
styles: FxHashMap::default(), styles: FxHashMap::default(),
children_to_parents: FxHashMap::default(), children_to_parents: FxHashMap::default(),
absolute_layout_bounds: FxHashMap::default(), absolute_layout_bounds: FxHashMap::default(),
@ -114,7 +114,7 @@ impl TaffyLayoutEngine {
fn max_depth(&self, depth: u32, parent: LayoutId) -> anyhow::Result<u32> { fn max_depth(&self, depth: u32, parent: LayoutId) -> anyhow::Result<u32> {
println!( println!(
"{parent:?} at depth {depth} has {} children", "{parent:?} at depth {depth} has {} children",
self.taffy.child_count(parent.0) self.taffy.child_count(parent.0)?
); );
let mut max_child_depth = 0; let mut max_child_depth = 0;