Merge branch 'main' into rename-element-traits

# Conflicts:
#	crates/gpui2/src/elements/uniform_list.rs
#	crates/ui2/src/components/context_menu.rs
#	crates/ui2/src/components/list.rs
This commit is contained in:
Antonio Scandurra 2023-11-23 12:47:46 +01:00
commit 3b918bfee8
34 changed files with 592 additions and 326 deletions

View file

@ -1350,7 +1350,7 @@ impl Pane {
let id = item.item_id();
div()
.id(item.item_id())
.id(ix)
.invisible()
.group_hover("", |style| style.visible())
.child(
@ -1382,7 +1382,7 @@ impl Pane {
div()
.group("")
.id(item.item_id())
.id(ix)
.cursor_pointer()
.when_some(item.tab_tooltip_text(cx), |div, text| {
div.tooltip(move |cx| cx.build_view(|cx| Tooltip::new(text.clone())).into())