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

gpui: Use taffy to retrieve the parent for a given layout node (#18730)

Browse source 
Again. https://github.com/zed-industries/zed/pull/4070

Let's see how it goes this time around. The only thing that might've
been related to that revert on our Slack was about crashing in collab
panel.

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2024-10-04 12:37:55 +02:00 • committed by GitHub
parent a99750fd35
commit 37ded190cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,6 @@ type NodeMeasureFn =
pub struct TaffyLayoutEngine { pub struct TaffyLayoutEngine {
taffy: TaffyTree<()>, taffy: TaffyTree<()>,
styles: FxHashMap<LayoutId, Style>, styles: FxHashMap<LayoutId, Style>,
children_to_parents: FxHashMap<LayoutId, LayoutId>,
absolute_layout_bounds: FxHashMap<LayoutId, Bounds<Pixels>>, absolute_layout_bounds: FxHashMap<LayoutId, Bounds<Pixels>>,
computed_layouts: FxHashSet<LayoutId>, computed_layouts: FxHashSet<LayoutId>,
nodes_to_measure: FxHashMap<LayoutId, NodeMeasureFn>, nodes_to_measure: FxHashMap<LayoutId, NodeMeasureFn>,
@ -31,7 +30,6 @@ impl TaffyLayoutEngine {
TaffyLayoutEngine { TaffyLayoutEngine {
taffy: TaffyTree::new(), taffy: TaffyTree::new(),
styles: FxHashMap::default(), styles: FxHashMap::default(),
children_to_parents: FxHashMap::default(),
absolute_layout_bounds: FxHashMap::default(), absolute_layout_bounds: FxHashMap::default(),
computed_layouts: FxHashSet::default(), computed_layouts: FxHashSet::default(),
nodes_to_measure: FxHashMap::default(), nodes_to_measure: FxHashMap::default(),
@ -40,7 +38,6 @@ impl TaffyLayoutEngine {
pub fn clear(&mut self) { pub fn clear(&mut self) {
self.taffy.clear(); self.taffy.clear();
self.children_to_parents.clear();
self.absolute_layout_bounds.clear(); self.absolute_layout_bounds.clear();
self.computed_layouts.clear(); self.computed_layouts.clear();
self.nodes_to_measure.clear(); self.nodes_to_measure.clear();
@ -68,8 +65,6 @@ impl TaffyLayoutEngine {
}) })
.expect(EXPECT_MESSAGE) .expect(EXPECT_MESSAGE)
.into(); .into();
self.children_to_parents
.extend(children.iter().map(|child_id| (*child_id, parent_id)));
parent_id parent_id
}; };
self.styles.insert(layout_id, style); self.styles.insert(layout_id, style);
@ -209,8 +204,8 @@ impl TaffyLayoutEngine {
size: layout.size.into(), size: layout.size.into(),
}; };
if let Some(parent_id) = self.children_to_parents.get(&id).copied() { if let Some(parent_id) = self.taffy.parent(id.0) {
let parent_bounds = self.layout_bounds(parent_id); let parent_bounds = self.layout_bounds(parent_id.into());
bounds.origin += parent_bounds.origin; bounds.origin += parent_bounds.origin;
} }
self.absolute_layout_bounds.insert(id, bounds); self.absolute_layout_bounds.insert(id, bounds);