Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tab highlight when tab is partially visible #3313

Merged
merged 3 commits into from
Aug 6, 2022
Merged

Fix tab highlight when tab is partially visible #3313

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e7fb20
Fix tab highlight when tab is partially visible
A-Walrus Aug 3, 2022
6c09daf
Make it style based, and not truncation based
A-Walrus Aug 3, 2022
0fd2140
Inline style calculation into branches
A-Walrus Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions helix-term/src/ui/editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,19 +530,33 @@ impl EditorView {
(grapheme.as_ref(), width)
};

let style = if is_whitespace {
style.patch(whitespace_style)
} else {
style
};
A-Walrus marked this conversation as resolved.
Show resolved Hide resolved

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(
viewport.x + visual_x - offset.col as u16,
viewport.y + line,
display_grapheme,
if is_whitespace {
style.patch(whitespace_style)
} else {
style
},
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,
);
Comment on lines +549 to +554
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Testing this out with something non-whitespace-like but multi-width like "😀", we render an empty space instead of any character (because of the rect here). I think that's a good choice but I wonder if there's anything better to signal that a multi-width character is getting chopped off here?

I would say … but then we're rendering something completely different than the actual source. Maybe the plain rect is the best choice? ¯\_(ツ)_/¯

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I considered rendering a character to indicate that a wide grapheme has been cut off, but I think keeping it simple and showing nothing is the right approach.
If we were to render a character it should probably be configurable which char to use, (like how it is with whitespace) but I think that's overkill.

surface.set_style(rect, style);
}

if is_in_indent_area && !(grapheme == " " || grapheme == "\t") {
draw_indent_guides(visual_x, line, surface);
is_in_indent_area = false;
Expand Down