mirror of
https://github.com/ilyakooo0/helix.git
synced 2024-09-11 16:07:00 +03:00
Fix tab highlight when tab is partially visible (#3313)
* Fix tab highlight when tab is partially visible * Make it style based, and not truncation based Dealing with truncating is a mess, especially when it comes to wide unicode graphemes. This way it should work no matter what. * Inline style calculation into branches
This commit is contained in:
parent
fdd8bbf16b
commit
c00b8f7ad7
@ -529,6 +529,8 @@ pub fn render_text_highlights<H: Iterator<Item = HighlightEvent>>(
|
||||
(grapheme.as_ref(), width)
|
||||
};
|
||||
|
||||
let cut_off_start = offset.col.saturating_sub(visual_x as usize);
|
||||
|
||||
if !out_of_bounds {
|
||||
// if we're offscreen just keep going until we hit a new line
|
||||
surface.set_string(
|
||||
@ -541,7 +543,24 @@ pub fn render_text_highlights<H: Iterator<Item = HighlightEvent>>(
|
||||
style
|
||||
},
|
||||
);
|
||||
} else if cut_off_start != 0 && cut_off_start < width {
|
||||
// partially on screen
|
||||
let rect = Rect::new(
|
||||
viewport.x as u16,
|
||||
viewport.y + line,
|
||||
(width - cut_off_start) as u16,
|
||||
1,
|
||||
);
|
||||
surface.set_style(
|
||||
rect,
|
||||
if is_whitespace {
|
||||
style.patch(whitespace_style)
|
||||
} else {
|
||||
style
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
if is_in_indent_area && !(grapheme == " " || grapheme == "\t") {
|
||||
draw_indent_guides(visual_x, line, surface);
|
||||
is_in_indent_area = false;
|
||||
|
Loading…
Reference in New Issue
Block a user