fix #119381: Scaling of fretboard chord diagrams

musescore · Jul 26, 2016 · fab2e3d · fab2e3d
1 parent b38ac07
commit fab2e3d
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/libmscore/fret.cpp b/libmscore/fret.cpp
@@ -286,8 +286,10 @@ void FretDiagram::draw(QPainter* painter) const
             qreal y = fretDist * i;
             painter->drawLine(QLineF(0.0, y, x2, y));
             }
-      painter->setFont(font);
-      QFontMetricsF fm(font);
+      QFont scaledFont(font);
+      scaledFont.setPixelSize(font.pixelSize() * _userMag);
+      painter->setFont(scaledFont);
+      QFontMetricsF fm(scaledFont);
       qreal dotd = stringDist * .6;
 
       for (int i = 0; i < _strings; ++i) {
@@ -358,7 +360,9 @@ void FretDiagram::layout()
       qreal x = -((dotd+lw1) * .5);
       w += dotd + lw1;
       if (_marker) {
-            QFontMetricsF fm(font);
+            QFont scaledFont(font);
+            scaledFont.setPixelSize(font.pixelSize() * _userMag);
+            QFontMetricsF fm(scaledFont);
             y = -(fretDist * .1 + fm.height());
             h -= y;
             }