diff --git a/src/rendering/glyphs/TrillGlyph.ts b/src/rendering/glyphs/TrillGlyph.ts index 20957716f..1ea0fe621 100644 --- a/src/rendering/glyphs/TrillGlyph.ts +++ b/src/rendering/glyphs/TrillGlyph.ts @@ -10,21 +10,21 @@ export class TrillGlyph extends EffectGlyph { public override doLayout(): void { super.doLayout(); - this.height = 20 * this.scale; + this.height = this.renderer.resources.markerFont.size * this.scale; } public override paint(cx: number, cy: number, canvas: ICanvas): void { let res: RenderingResources = this.renderer.resources; canvas.font = res.markerFont; let textw: number = canvas.measureText('tr'); - canvas.fillText('tr', cx + this.x, cy + this.y + canvas.font.size / 2); + canvas.fillText('tr', cx + this.x, cy + this.y); let startX: number = textw + 3 * this.scale; let endX: number = this.width - startX; let waveScale: number = 1.2; let step: number = 11 * this.scale * waveScale; let loops: number = Math.max(1, (endX - startX) / step); let loopX: number = startX; - let loopY: number = cy + this.y + this.height; + let loopY: number = cy + this.y + this.height * 1.2; for (let i: number = 0; i < loops; i++) { canvas.fillMusicFontSymbol( cx + this.x + loopX, diff --git a/test-data/visual-tests/effects-and-annotations/trill.png b/test-data/visual-tests/effects-and-annotations/trill.png index 323602896..9d1508b78 100644 Binary files a/test-data/visual-tests/effects-and-annotations/trill.png and b/test-data/visual-tests/effects-and-annotations/trill.png differ diff --git a/test-data/visual-tests/notation-legend/full-default.png b/test-data/visual-tests/notation-legend/full-default.png index c6b9025bb..73d0356c7 100644 Binary files a/test-data/visual-tests/notation-legend/full-default.png and b/test-data/visual-tests/notation-legend/full-default.png differ diff --git a/test-data/visual-tests/notation-legend/full-songbook.png b/test-data/visual-tests/notation-legend/full-songbook.png index b3998f0a4..167ba0ffd 100644 Binary files a/test-data/visual-tests/notation-legend/full-songbook.png and b/test-data/visual-tests/notation-legend/full-songbook.png differ diff --git a/test-data/visual-tests/notation-legend/resize-sequence-1300.png b/test-data/visual-tests/notation-legend/resize-sequence-1300.png index 9f80e156f..db0bccd2b 100644 Binary files a/test-data/visual-tests/notation-legend/resize-sequence-1300.png and b/test-data/visual-tests/notation-legend/resize-sequence-1300.png differ diff --git a/test-data/visual-tests/notation-legend/resize-sequence-1500.png b/test-data/visual-tests/notation-legend/resize-sequence-1500.png index 6962a0df9..50c4fa063 100644 Binary files a/test-data/visual-tests/notation-legend/resize-sequence-1500.png and b/test-data/visual-tests/notation-legend/resize-sequence-1500.png differ diff --git a/test-data/visual-tests/notation-legend/resize-sequence-500.png b/test-data/visual-tests/notation-legend/resize-sequence-500.png index 47ac135ca..470c95612 100644 Binary files a/test-data/visual-tests/notation-legend/resize-sequence-500.png and b/test-data/visual-tests/notation-legend/resize-sequence-500.png differ diff --git a/test-data/visual-tests/notation-legend/resize-sequence-800.png b/test-data/visual-tests/notation-legend/resize-sequence-800.png index 0b427fe47..e7753f6e7 100644 Binary files a/test-data/visual-tests/notation-legend/resize-sequence-800.png and b/test-data/visual-tests/notation-legend/resize-sequence-800.png differ diff --git a/test-data/visual-tests/notation-legend/trill-default.png b/test-data/visual-tests/notation-legend/trill-default.png index e207bca27..4db46222a 100644 Binary files a/test-data/visual-tests/notation-legend/trill-default.png and b/test-data/visual-tests/notation-legend/trill-default.png differ diff --git a/test-data/visual-tests/notation-legend/trill-songbook.png b/test-data/visual-tests/notation-legend/trill-songbook.png index e207bca27..4db46222a 100644 Binary files a/test-data/visual-tests/notation-legend/trill-songbook.png and b/test-data/visual-tests/notation-legend/trill-songbook.png differ