mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-16 07:11:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Fix z-indexes in editor element

Browse source 
* Ensure that scroll events from blocks scroll the editor
* Ensure that scroll bars show behind hover things
This commit is contained in:
Conrad Irwin 2023-12-14 10:36:16 -07:00
parent c2c7eead8a
commit d8cb0e8a2a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1095,7 +1095,7 @@ impl EditorElement {
}
});
cx.with_z_index(1, |cx| {
cx.with_z_index(2, |cx| {
if let Some((position, mut context_menu)) = layout.context_menu.take() {
let available_space =
size(AvailableSpace::MinContent, AvailableSpace::MinContent);
@ -2825,14 +2825,16 @@ impl Element for EditorElement {
self.paint_text(text_bounds, &mut layout, cx);
if !layout.blocks.is_empty() {
cx.with_z_index(1, |cx| {
// z-index of 0 so that it is on the same mouse event layer as the editor's
// mouse events
cx.with_z_index(0, |cx| {
cx.with_element_id(Some("editor_blocks"), |cx| {
self.paint_blocks(bounds, &mut layout, cx);
});
})
}
cx.with_z_index(2, |cx| self.paint_scrollbar(bounds, &mut layout, cx));
cx.with_z_index(1, |cx| self.paint_scrollbar(bounds, &mut layout, cx));
});
});
})