Skip to content

Commit

Permalink
Fix #300340: Additive Time Signatures Do Not Appear Properly in the G…
Browse files Browse the repository at this point in the history
…onville Font
  • Loading branch information
elerouxx committed Sep 2, 2020
1 parent 568e538 commit 78dab12
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions libmscore/sym.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5817,7 +5817,7 @@ void ScoreFont::draw(const std::vector<SymId>& ids, QPainter* p, const QSizeF& m
QPointF pos(_pos);
for (SymId id : ids) {
draw(id, p, mag, pos, scale);
pos.rx() += (sym(id).advance() * mag.width());
pos.rx() += advance(id, mag.width());
}
}

Expand Down Expand Up @@ -6323,7 +6323,7 @@ const QRectF ScoreFont::bbox(SymId id, qreal mag) const
const QRectF ScoreFont::bbox(SymId id, const QSizeF& mag) const
{
if (useFallbackFont(id))
return fallbackFont()->bbox(id, mag.width());
return fallbackFont()->bbox(id, mag);
QRectF r = sym(id).bbox();
return QRectF(r.x() * mag.width(), r.y() * mag.height(), r.width() * mag.width(), r.height() * mag.height());
}
Expand Down

0 comments on commit 78dab12

Please sign in to comment.