Fix image preview placement when messages are preceded by a date in the timeline #257
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ulyssa
added
bug
ulyssa
reviewed
Apr 13, 2024
| @@ -961,6 +961,8 @@ impl Message { | |||
| let proto = proto.map(|p| { | |||
| let y_off = text.lines.len() as u16; | |||
| let x_off = fmt.cols.user_gutter_width(settings); | |||
| // Adjust y_off by 1 if a date was printed before the message to account for the extra line. | |||
| let y_off = if fmt.date.is_some() { y_off + 1 } else { y_off }; | |||
There was a problem hiding this comment.
Good catch! This isn't quite right though, since if there's a reply then text.lines will already include the date, and we'll double count it here. The date printing code should probably be moved out of MessageFormatter::push_spans and into its own MessageFormatter::push_date method that gets called before pushing the reply text instead.
EDIT: Nevermind, that's wrong since the self.date.take() will make this None. This looks good to me!
|
Merged! Thank you for fixing this! |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently image previews are printed one line too high if the message had a date inserted into it indicating a change of date between the current and preceding message. With this PR we conditionally check if a date was inserted and adjust the y offset used to place the rendered the image.
Tested in:
XTerm(374),wezterm 20240203-110809-5046fc22, andkonsole 24.02.1.Before change:
After change:
