diff --git a/src/rendering/TabBarRenderer.ts b/src/rendering/TabBarRenderer.ts index b8f900126..5ad131f33 100644 --- a/src/rendering/TabBarRenderer.ts +++ b/src/rendering/TabBarRenderer.ts @@ -51,7 +51,7 @@ export class TabBarRenderer extends BarRendererBase { protected updateSizes(): void { let res: RenderingResources = this.resources; - let numberOverflow: number = res.tablatureFont.size / 2 + res.tablatureFont.size * 0.2; + let numberOverflow: number = (res.tablatureFont.size / 2 + res.tablatureFont.size * 0.2) * this.scale; this.topPadding = numberOverflow; this.bottomPadding = numberOverflow; this.height = this.lineOffset * (this.bar.staff.tuning.length - 1) + numberOverflow * 2; diff --git a/src/rendering/glyphs/NoteNumberGlyph.ts b/src/rendering/glyphs/NoteNumberGlyph.ts index 87ea332a6..bf34928a0 100644 --- a/src/rendering/glyphs/NoteNumberGlyph.ts +++ b/src/rendering/glyphs/NoteNumberGlyph.ts @@ -79,7 +79,7 @@ export class NoteNumberGlyph extends Glyph { this.isEmpty = !this._noteString; if (!this.isEmpty) { this.renderer.scoreRenderer.canvas!.font = this.renderer.resources.tablatureFont; - this.width = this.noteStringWidth = this.renderer.scoreRenderer.canvas!.measureText(this._noteString); + this.width = this.noteStringWidth = this.renderer.scoreRenderer.canvas!.measureText(this._noteString) * this.scale; this.height = this.renderer.scoreRenderer.canvas!.font.size; let hasTrill: boolean = !!this._trillNoteString; if (hasTrill) { diff --git a/src/rendering/glyphs/VoiceContainerGlyph.ts b/src/rendering/glyphs/VoiceContainerGlyph.ts index 59bbcd650..6906037db 100644 --- a/src/rendering/glyphs/VoiceContainerGlyph.ts +++ b/src/rendering/glyphs/VoiceContainerGlyph.ts @@ -30,13 +30,14 @@ export class VoiceContainerGlyph extends GlyphGroup { } private scaleToForce(force: number): void { - this.width = this.renderer.layoutingInfo.calculateVoiceWidth(force); + const scale = this.renderer.scale; + this.width = this.renderer.layoutingInfo.calculateVoiceWidth(force) * scale; let positions: Map = this.renderer.layoutingInfo.buildOnTimePositions(force); let beatGlyphs: BeatContainerGlyph[] = this.beatGlyphs; for (let i: number = 0, j: number = beatGlyphs.length; i < j; i++) { let currentBeatGlyph: BeatContainerGlyph = beatGlyphs[i]; let time: number = currentBeatGlyph.beat.absoluteDisplayStart; - currentBeatGlyph.x = positions.get(time)! - currentBeatGlyph.onTimeX; + currentBeatGlyph.x = positions.get(time)! * scale - currentBeatGlyph.onTimeX; // size always previousl glyph after we know the position // of the next glyph if (i > 0) {