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

Jump to bottom

Fix canvas underline is cut off. #4664

Merged
merged 2 commits into from
Aug 11, 2023
Merged

Fix canvas underline is cut off. #4664

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f317b96
Fix canvas underline is cut off.
tisilent Aug 11, 2023
07d1871
Update src/browser/renderer/shared/TextureAtlas.ts
Tyriar Aug 11, 2023
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: 9 additions & 15 deletions src/browser/renderer/shared/TextureAtlas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,10 +532,11 @@ export class TextureAtlas implements ITextureAtlas {
// Underline style/stroke
this._tmpCtx.beginPath();
const xLeft = padding;
const yTop = Math.ceil(padding + this._config.deviceCharHeight) - yOffset;
const yMid = padding + this._config.deviceCharHeight + lineWidth - yOffset;
const yBot = Math.ceil(padding + this._config.deviceCharHeight + lineWidth * 2) - yOffset;
const ySpace = lineWidth * 2;
const yTop = restrictToCellHeight ?
Math.ceil(padding + this._config.deviceCharHeight) - yOffset - lineWidth * 2 :
Math.ceil(padding + this._config.deviceCharHeight) - yOffset;
Tyriar marked this conversation as resolved.
Show resolved Hide resolved
const yMid = yTop + lineWidth;
const yBot = yTop + lineWidth * 2;
Copy link
Member

Choose a reason for hiding this comment

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

Nice, just the sort of thing I was thinking!

I'll keep a look out for any regressions as we are handling decimal values slightly differently, it seems to work after a quick test though and the change should only be with yMid which is for curly


for (let i = 0; i < chWidth; i++) {
this._tmpCtx.save();
Expand All @@ -544,17 +545,10 @@ export class TextureAtlas implements ITextureAtlas {
const xChMid = xChLeft + this._config.deviceCellWidth / 2;
switch (this._workAttributeData.extended.underlineStyle) {
case UnderlineStyle.DOUBLE:
if (restrictToCellHeight) {
this._tmpCtx.moveTo(xChLeft, yTop - ySpace);
this._tmpCtx.lineTo(xChRight, yTop - ySpace);
this._tmpCtx.moveTo(xChLeft, yTop);
this._tmpCtx.lineTo(xChRight, yTop);
} else {
this._tmpCtx.moveTo(xChLeft, yTop);
this._tmpCtx.lineTo(xChRight, yTop);
this._tmpCtx.moveTo(xChLeft, yBot);
this._tmpCtx.lineTo(xChRight, yBot);
}
this._tmpCtx.moveTo(xChLeft, yTop);
this._tmpCtx.lineTo(xChRight, yTop);
this._tmpCtx.moveTo(xChLeft, yBot);
this._tmpCtx.lineTo(xChRight, yBot);
break;
case UnderlineStyle.CURLY:
// Choose the bezier top and bottom based on the device pixel ratio, the curly line is
Expand Down