Merge branch 'main' into zed2-breadcrumbs

2023-12-01 12:28:36 -05:00
parent 910aeb4f56 85d72f63c1
commit 6f9e08ceea
10 changed files with 746 additions and 326 deletions
@@ -26,7 +26,7 @@ use std::{
    },
 };

-use ui::{menu_handle, prelude::*, Color, Icon, IconButton, IconElement, Tooltip};
+use ui::{prelude::*, right_click_menu, Color, Icon, IconButton, IconElement, Tooltip};
 use ui::{v_stack, ContextMenu};
 use util::truncate_and_remove_front;

@@ -1524,7 +1524,7 @@ impl Pane {
                    .children(close_right.then(|| close_icon())),
            );

-        menu_handle(ix).child(|_| tab).menu(|cx| {
+        right_click_menu(ix).trigger(tab).menu(|cx| {
            ContextMenu::build(cx, |menu, cx| {
                menu.action(
                    "Close Active Item",