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

tidy up names

Browse source
This commit is contained in:
Mikayla Maki 2023-07-13 14:34:32 -07:00
parent 331fd896b5
commit 9da8f609cf
No known key found for this signature in database
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/workspace/src/pane_group.rs
View file

@ -421,14 +421,13 @@ impl PaneAxis {
) -> AnyElement<Workspace> { ) -> AnyElement<Workspace> {
debug_assert!(self.members.len() == self.flexes.borrow().len()); debug_assert!(self.members.len() == self.flexes.borrow().len());
let mut flex_container = PaneAxisElement::new(self.axis, basis, self.flexes.clone()); let mut pane_axis = PaneAxisElement::new(self.axis, basis, self.flexes.clone());
let mut active_pane_ix = None; let mut active_pane_ix = None;
let mut members = self.members.iter().enumerate().peekable(); let mut members = self.members.iter().enumerate().peekable();
while let Some((ix, member)) = members.next() { while let Some((ix, member)) = members.next() {
let last = members.peek().is_none(); let last = members.peek().is_none();
// TODO: Restore this
if member.contains(active_pane) { if member.contains(active_pane) {
active_pane_ix = Some(ix); active_pane_ix = Some(ix);
} }
@ -460,10 +459,10 @@ impl PaneAxis {
member = member.contained().with_border(border).into_any(); member = member.contained().with_border(border).into_any();
} }
flex_container = flex_container.with_child(member.into_any()); pane_axis = pane_axis.with_child(member.into_any());
} }
flex_container.set_active_pane(active_pane_ix); pane_axis.set_active_pane(active_pane_ix);
flex_container.into_any() pane_axis.into_any()
} }
} }
@ -562,7 +561,7 @@ mod element {
self.active_pane_ix = active_pane_ix; self.active_pane_ix = active_pane_ix;
} }
fn layout_flex_children( fn layout_children(
&mut self, &mut self,
active_pane_magnification: f32, active_pane_magnification: f32,
constraint: SizeConstraint, constraint: SizeConstraint,
@ -656,7 +655,7 @@ mod element {
panic!("flex contains flexible children but has an infinite constraint along the flex axis"); panic!("flex contains flexible children but has an infinite constraint along the flex axis");
} }
self.layout_flex_children( self.layout_children(
active_pane_magnification, active_pane_magnification,
constraint, constraint,
&mut remaining_space, &mut remaining_space,
@ -846,6 +845,7 @@ mod element {
"type": "PaneAxis", "type": "PaneAxis",
"bounds": bounds.to_json(), "bounds": bounds.to_json(),
"axis": self.axis.to_json(), "axis": self.axis.to_json(),
"flexes": *self.flexes.borrow(),
"children": self.children.iter().map(|child| child.debug(view, cx)).collect::<Vec<json::Value>>() "children": self.children.iter().map(|child| child.debug(view, cx)).collect::<Vec<json::Value>>()
}) })
} }