mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-27 04:44:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Upgrade to Taffy 0.4 (#7868)

Browse source 
Upgraded Taffy to v0.4.0 from crates.io (previously using prerelease
version from git).

Code changes required were minor as gpui was already using a recent
version of Taffy.

Release Notes:

- N/A
This commit is contained in:
Nico Burns 2024-02-16 11:30:39 +13:00 committed by GitHub
parent 94426c4393
commit 694e18417e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Cargo.lock generated
View file

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

2
crates/gpui/Cargo.toml
View file

@ -60,7 +60,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 = { git = "https://github.com/DioxusLabs/taffy", rev = "1876f72bee5e376023eaa518aa7b8a34c769bd1b" } taffy = "0.4"
thiserror.workspace = true thiserror.workspace = true
time.workspace = true time.workspace = true
tiny-skia = "0.5" tiny-skia = "0.5"

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

@ -6,17 +6,15 @@ use collections::{FxHashMap, FxHashSet};
use smallvec::SmallVec; use smallvec::SmallVec;
use std::fmt::Debug; use std::fmt::Debug;
use taffy::{ use taffy::{
geometry::{Point as TaffyPoint, Rect as TaffyRect, Size as TaffySize}, AvailableSpace as TaffyAvailableSpace, NodeId, Point as TaffyPoint, Rect as TaffyRect,
style::AvailableSpace as TaffyAvailableSpace, Size as TaffySize, TaffyTree, TraversePartialTree,
tree::NodeId,
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: Taffy, taffy: TaffyTree<()>,
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 +27,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: Taffy::new(), taffy: TaffyTree::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(),
@ -120,7 +118,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;