Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into rename-element-traits

Browse source 
# 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
Download patch file Download diff file Expand all files Collapse all files

2
crates/editor2/src/element.rs
View file

@ -1051,7 +1051,7 @@ impl EditorElement {
}
if list_origin.y + list_height > text_bounds.lower_right().y {
list_origin.y -= layout.position_map.line_height - list_height;
list_origin.y -= layout.position_map.line_height + list_height;
}
context_menu.draw(list_origin, available_space, cx);