zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-01 06:43:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix multibuffer scroll by reordering z-index of its elements

Browse Source 
1. Blocks (with their headers) and mouse listeners should be drawn together otherwise either starts to loose mouse events.

2. Scrollbar should be above all to match zed1 look and avoid buffer headers popping slightly to the right of the scrollbar.
This commit is contained in:
Kirill Bulatov 2023-12-22 22:56:35 +02:00
parent dc64411cca
commit 764a2755e2
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/editor2/src/element.rs
View File

@ -2840,23 +2840,26 @@ impl Element for EditorElement {
}
self.paint_text(text_bounds, &mut layout, cx);
cx.with_z_index(0, |cx| {
self.paint_mouse_listeners(bounds, gutter_bounds, text_bounds, &layout, cx);
});
cx.with_z_index(1, |cx| self.paint_scrollbar(bounds, &mut layout, cx));
if !layout.blocks.is_empty() {
cx.with_z_index(2, |cx| {
cx.with_z_index(0, |cx| {
cx.with_element_id(Some("editor_blocks"), |cx| {
self.paint_blocks(bounds, &mut layout, cx);
self.paint_mouse_listeners(
bounds,
gutter_bounds,
text_bounds,
&layout,
cx,
);
});
})
}
cx.with_z_index(3, |cx| {
cx.with_z_index(1, |cx| {
self.paint_overlays(text_bounds, &mut layout, cx);
});
cx.with_z_index(2, |cx| self.paint_scrollbar(bounds, &mut layout, cx));
});
})
}