From 971cf63d3b7f1c4733769e4751bd2706405d9616 Mon Sep 17 00:00:00 2001 From: Werner Schweer Date: Mon, 10 Oct 2016 19:51:43 +0200 Subject: [PATCH] fix #136781: fretboard diagrams have lost the fret position number, inter alia, in the palettes --- libmscore/fret.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libmscore/fret.cpp b/libmscore/fret.cpp index 687b9919a9dfd..1435349ab8e61 100644 --- a/libmscore/fret.cpp +++ b/libmscore/fret.cpp @@ -35,7 +35,7 @@ FretDiagram::FretDiagram(Score* score) { setFlags(ElementFlag::MOVABLE | ElementFlag::ON_STAFF | ElementFlag::SELECTABLE); font.setFamily("FreeSans"); - font.setPixelSize(4.0 * mag()); + font.setPointSize(4.0 * mag()); } FretDiagram::FretDiagram(const FretDiagram& f) @@ -287,8 +287,10 @@ void FretDiagram::draw(QPainter* painter) const } QFont scaledFont(font); scaledFont.setPointSizeF(font.pointSize() * _userMag); - painter->setFont(scaledFont); QFontMetricsF fm(scaledFont, MScore::paintDevice()); + scaledFont.setPointSizeF(scaledFont.pointSizeF() * MScore::pixelRatio); + + painter->setFont(scaledFont); qreal dotd = stringDist * .6; for (int i = 0; i < _strings; ++i) { @@ -326,7 +328,7 @@ void FretDiagram::draw(QPainter* painter) const if (_fretOffset > 0) { qreal fretNumMag = score()->styleD(StyleIdx::fretNumMag); QFont scaledFont(font); - scaledFont.setPointSizeF(font.pointSize() * fretNumMag * _userMag); + scaledFont.setPointSizeF(font.pointSize() * fretNumMag * _userMag * MScore::pixelRatio); painter->setFont(scaledFont); if (score()->styleI(StyleIdx::fretNumPos) == 0) painter->drawText(QRectF(-stringDist *.4, .0, .0, fretDist),