zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Display blocks over the git hunks (#15083)

Browse Source 
Before:

![before](https://github.com/user-attachments/assets/614bbafd-f344-4c86-bd62-fff5f1ab143a)

After:

![after](https://github.com/user-attachments/assets/40a72a46-9fc4-4f94-9090-fb389f824a8d)


Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2024-07-24 17:23:20 +03:00 committed by GitHub
parent 23c5fc1b03
commit 64b15d3a0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
crates/editor/src/element.rs
View File

@ -1951,16 +1951,20 @@ impl EditorElement {
.x_for_index(align_to.column() as usize)
};
block.render(&mut BlockContext {
context: cx,
anchor_x,
gutter_dimensions,
line_height,
em_width,
block_id,
max_width: text_hitbox.size.width.max(*scroll_width),
editor_style: &self.style,
})
div()
.size_full()
.child(block.render(&mut BlockContext {
context: cx,
anchor_x,
gutter_dimensions,
line_height,
em_width,
block_id,
max_width: text_hitbox.size.width.max(*scroll_width),
editor_style: &self.style,
}))
.on_mouse_down(MouseButton::Left, |_, cx| cx.stop_propagation())
.into_any_element()
}
Block::ExcerptHeader {
@ -5568,17 +5572,17 @@ impl Element for EditorElement {
self.paint_text(layout, cx);
if layout.gutter_hitbox.size.width > Pixels::ZERO {
self.paint_gutter_highlights(layout, cx);
self.paint_gutter_indicators(layout, cx);
}
if !layout.blocks.is_empty() {
cx.with_element_namespace("blocks", |cx| {
self.paint_blocks(layout, cx);
});
}
if layout.gutter_hitbox.size.width > Pixels::ZERO {
self.paint_gutter_highlights(layout, cx);
self.paint_gutter_indicators(layout, cx);
}
self.paint_scrollbar(layout, cx);
self.paint_mouse_context_menu(layout, cx);
});