Allow all overflowing characters to extend to the next cell if followed by a space (Emojis etc) #997
+55
−24
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
Tyriar
requested changes
Sep 15, 2017
src/renderer/TextRenderLayer.ts
Outdated
| } | ||
|
|
||
| // Set the correct character font for the current context | ||
| let font; |
There was a problem hiding this comment.
Instead of doing this use this._ctx.save() before you change .font and .restore() after. This allows you to temporarily change the style and then revert the changes after restore.
src/renderer/TextRenderLayer.ts
Outdated
| * Whether a character is overlapping to the | ||
| * next cell. | ||
| */ | ||
| private _isOverlapping(char: string): boolean { |
There was a problem hiding this comment.
Let's also pass in char code, maybe the CharData object would be easier since we need 2 of its props?
src/renderer/TextRenderLayer.ts
Outdated
| * next cell. | ||
| */ | ||
| private _isOverlapping(char: string): boolean { | ||
|
|
There was a problem hiding this comment.
The common case:
if (code < 256) {
return false;
}
It should be safe to assume this.
src/renderer/TextRenderLayer.ts
Outdated
| if (font) this._ctx.font = font; | ||
|
|
||
| // Cache and return | ||
| return this._characterOverlapCache[char] = overlaps; |
There was a problem hiding this comment.
Let's make this 2 lines, I always have to have a second look as doing this behaves very differently in different languages.
src/renderer/TextRenderLayer.ts
Outdated
| // Measure the width of the character, but Math.floor it | ||
| // because that is what the renderer does when it calculates | ||
| // the character dimensions we are comparing against | ||
| const overlaps = Math.floor(this._ctx.measureText(char).width) > this._characterWidth; |
There was a problem hiding this comment.
This function seems a lot faster than I was expecting 😄
Tyriar
approved these changes
Sep 15, 2017
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.
Fixes #974
This PR tries to provide a more generic way of detecting overlapping characters and allowing them to be drawn to the next cell if that cell is empty (space). The first time a character is seen, it will measure the width of that character and then check if the character is overlapping. It will then cache that result, so subsequent character appearances don't have to be measured again. The cache will be cleared if the font, or the measured character width changes.