Deploy the buffer search in a second row in the toolbar (#3630)
This PR updates the buffer search to deploy to a second row in the toolbar, instead of trying to deploy into the initial row. This is the same way it works in Zed1. Release Notes: - N/A
This commit is contained in:
parent
07a266d93f
commit
61ab1834c7
2 changed files with 22 additions and 2 deletions
|
@ -74,12 +74,24 @@ impl Toolbar {
|
|||
}
|
||||
})
|
||||
}
|
||||
|
||||
fn secondary_items(&self) -> impl Iterator<Item = &dyn ToolbarItemViewHandle> {
|
||||
self.items.iter().filter_map(|(item, location)| {
|
||||
if *location == ToolbarItemLocation::Secondary {
|
||||
Some(item.as_ref())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl Render for Toolbar {
|
||||
type Element = Div;
|
||||
|
||||
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
|
||||
let secondary_item = self.secondary_items().next().map(|item| item.to_any());
|
||||
|
||||
v_stack()
|
||||
.border_b()
|
||||
.border_color(cx.theme().colors().border_variant)
|
||||
|
@ -87,8 +99,10 @@ impl Render for Toolbar {
|
|||
.child(
|
||||
h_stack()
|
||||
.justify_between()
|
||||
.children(self.items.iter().map(|(child, _)| child.to_any())),
|
||||
.child(h_stack().children(self.left_items().map(|item| item.to_any())))
|
||||
.child(h_stack().children(self.right_items().map(|item| item.to_any()))),
|
||||
)
|
||||
.children(secondary_item)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue