editor: Fix text selection not visible on text background (#26454)
Closes #25014 Previously, we painted in the order: highlights -> text background -> text -> etc. This caused text selection to be invisible when the text had a background. This PR changes the painting order to: text background -> highlights -> text -> etc. Before: https://github.com/user-attachments/assets/5d9647c4-3ab2-4960-b6b9-e399882a0c50 After: https://github.com/user-attachments/assets/c699f5b9-4077-45f8-85e5-86c89130eb71 Release Notes: - Fixed an issue where text selection was not visible on top of a text background in the editor.
This commit is contained in:
@@ -4653,6 +4653,7 @@ impl EditorElement {
|
||||
};
|
||||
window.set_cursor_style(cursor_style, &layout.position_map.text_hitbox);
|
||||
|
||||
self.paint_lines_background(layout, window, cx);
|
||||
let invisible_display_ranges = self.paint_highlights(layout, window);
|
||||
self.paint_lines(&invisible_display_ranges, layout, window, cx);
|
||||
self.paint_redactions(layout, window);
|
||||
@@ -4743,6 +4744,18 @@ impl EditorElement {
|
||||
}
|
||||
}
|
||||
|
||||
fn paint_lines_background(
|
||||
&mut self,
|
||||
layout: &mut EditorLayout,
|
||||
window: &mut Window,
|
||||
cx: &mut App,
|
||||
) {
|
||||
for (ix, line_with_invisibles) in layout.position_map.line_layouts.iter().enumerate() {
|
||||
let row = DisplayRow(layout.visible_display_row_range.start.0 + ix as u32);
|
||||
line_with_invisibles.draw_background(layout, row, layout.content_origin, window, cx);
|
||||
}
|
||||
}
|
||||
|
||||
fn paint_redactions(&mut self, layout: &EditorLayout, window: &mut Window) {
|
||||
if layout.redacted_ranges.is_empty() {
|
||||
return;
|
||||
@@ -6237,6 +6250,35 @@ impl LineWithInvisibles {
|
||||
);
|
||||
}
|
||||
|
||||
fn draw_background(
|
||||
&self,
|
||||
layout: &EditorLayout,
|
||||
row: DisplayRow,
|
||||
content_origin: gpui::Point<Pixels>,
|
||||
window: &mut Window,
|
||||
cx: &mut App,
|
||||
) {
|
||||
let line_height = layout.position_map.line_height;
|
||||
let line_y = line_height
|
||||
* (row.as_f32() - layout.position_map.scroll_pixel_position.y / line_height);
|
||||
|
||||
let mut fragment_origin =
|
||||
content_origin + gpui::point(-layout.position_map.scroll_pixel_position.x, line_y);
|
||||
|
||||
for fragment in &self.fragments {
|
||||
match fragment {
|
||||
LineFragment::Text(line) => {
|
||||
line.paint_background(fragment_origin, line_height, window, cx)
|
||||
.log_err();
|
||||
fragment_origin.x += line.width;
|
||||
}
|
||||
LineFragment::Element { size, .. } => {
|
||||
fragment_origin.x += size.width;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn draw_invisibles(
|
||||
&self,
|
||||
selection_ranges: &[Range<DisplayPoint>],
|
||||
|
||||
Reference in New Issue
Block a user