mirror of
https://github.com/zed-industries/zed.git
synced 2025-01-08 13:59:23 +03:00
Rebase main and fix error
This commit is contained in:
parent
8301ee43d6
commit
5302c256a4
@ -111,11 +111,12 @@ impl View for BranchesButton {
|
||||
|
||||
impl BranchesButton {
|
||||
pub fn new(workspace: ViewHandle<Workspace>, cx: &mut ViewContext<Self>) -> Self {
|
||||
let parent_id = cx.view_id();
|
||||
cx.observe(&workspace, |_, _, cx| cx.notify()).detach();
|
||||
Self {
|
||||
workspace: workspace.downgrade(),
|
||||
popup_menu: cx.add_view(|cx| {
|
||||
let mut menu = ContextMenu::new(cx);
|
||||
let mut menu = ContextMenu::new(parent_id, cx);
|
||||
menu.set_position_mode(OverlayPositionMode::Local);
|
||||
menu
|
||||
}),
|
||||
|
Loading…
Reference in New Issue
Block a user