Rebase main and fix error

Petros Amoiridis created 2 years ago

Change summary

crates/collab_ui/src/branches_button.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Detailed changes

crates/collab_ui/src/branches_button.rs

@@ -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
             }),