mirror/html2canvas
1
0
Fork 0
mirror of https://github.com/niklasvh/html2canvas.git synced 2023-08-10 21:13:10 +03:00
Code Issues Projects Releases Wiki Activity

fix: text position for form elements and list markers (#2588)

Browse Source
This commit is contained in:
Niklas von Hertzen 2021-07-15 16:54:01 +08:00 committed by GitHub
parent fa60716d07
commit cd99f11b1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/render/canvas/canvas-renderer.ts
View File

@ -376,7 +376,7 @@ export class CanvasRenderer {
this.ctx.font = fontFamily; this.ctx.font = fontFamily;
this.ctx.fillStyle = asString(styles.color); this.ctx.fillStyle = asString(styles.color);
this.ctx.textBaseline = 'middle'; this.ctx.textBaseline = 'alphabetic';
this.ctx.textAlign = canvasTextAlign(container.styles.textAlign); this.ctx.textAlign = canvasTextAlign(container.styles.textAlign);
const bounds = contentBox(container); const bounds = contentBox(container);
@ -409,7 +409,7 @@ export class CanvasRenderer {
baseline baseline
); );
this.ctx.restore(); this.ctx.restore();
this.ctx.textBaseline = 'bottom'; this.ctx.textBaseline = 'alphabetic';
this.ctx.textAlign = 'left'; this.ctx.textAlign = 'left';
} }
@ -427,7 +427,7 @@ export class CanvasRenderer {
} }
} }
} else if (paint.listValue && container.styles.listStyleType !== LIST_STYLE_TYPE.NONE) { } else if (paint.listValue && container.styles.listStyleType !== LIST_STYLE_TYPE.NONE) {
const [fontFamily, fontSize] = this.createFontStyle(styles); const [fontFamily] = this.createFontStyle(styles);
this.ctx.font = fontFamily; this.ctx.font = fontFamily;
this.ctx.fillStyle = asString(styles.color); this.ctx.fillStyle = asString(styles.color);
@ -441,12 +441,10 @@ export class CanvasRenderer {
computeLineHeight(styles.lineHeight, styles.fontSize.number) / 2 + 1 computeLineHeight(styles.lineHeight, styles.fontSize.number) / 2 + 1
); );
const {baseline} = this.fontMetrics.getMetrics(fontFamily, fontSize);
this.renderTextWithLetterSpacing( this.renderTextWithLetterSpacing(
new TextBounds(paint.listValue, bounds), new TextBounds(paint.listValue, bounds),
styles.letterSpacing, styles.letterSpacing,
baseline computeLineHeight(styles.lineHeight, styles.fontSize.number) / 2 + 2
); );
this.ctx.textBaseline = 'bottom'; this.ctx.textBaseline = 'bottom';
this.ctx.textAlign = 'left'; this.ctx.textAlign = 'left';