Remove soft break tofu in cairo #362
Closed
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
richard-uk1
force-pushed
the
newline_tofu
branch
from
06dd773 to
7705860
Compare
Changes in `piet-cairo`.
richard-uk1
force-pushed
the
newline_tofu
branch
from
7705860 to
e3321ab
Compare
|
It might be that this has to wait until proper shaping, but I will try to land something sensible sooner. |
cmyr
approved these changes
Dec 8, 2020
| @@ -132,10 +132,17 @@ pub(crate) fn calculate_line_metrics(text: &str, font: &ScaledFont, width: f64) | |||
| } | |||
|
|
|||
| // now do the hard break | |||
| let mut line_end = line_break; | |||
| // Remove any trailing newline characters from the line. | |||
| while matches!(text.get(line_end - 1..line_end), Some("\n") | Some("\r")) | |||
There was a problem hiding this comment.
Was slightly confused here for a second; I couldn't tell that this wouldn't screw up in cases where there were multiple newlines in a row, which should be treated as actual newlines.
Since this is linux I'm also not sure we care about \r?
just for fun I'd have probably written something like,
let line_text = &text[line_start..line_end];
let newline_len = line_text.as_bytes().rev().take_while(|b| b == b'\n'').count();
let line_end = line_end - newline_len;There was a problem hiding this comment.
Yeah \r is probably overkill.
There was a problem hiding this comment.
I also think your solution is better.
|
going to close this since we'll resolve in #389. |
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.
I still need to figure out how to regenerate the snapshots.