fix #117191 and fix #82021 hack to correct font kerning under Windows

musescore · Oct 2, 2017 · 4e2647c · 4e2647c
1 parent 072c135
commit 4e2647c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/libmscore/mscore.h b/libmscore/mscore.h
@@ -71,6 +71,11 @@ static constexpr qreal INCH      = 25.4;
 static constexpr qreal PPI       = 72.0;           // printer points per inch
 static constexpr qreal SPATIUM20 = 5.0;
 static constexpr qreal DPI       = 72.0;
+#ifdef Q_OS_WIN
+static constexpr qreal DPIFACTOR = 100.0;       // scaling factor to adjust kerning under Windows, see 
+#else
+static constexpr qreal DPIFACTOR = 1.0;
+#endif
 static constexpr qreal DPMM      = DPI / INCH;
 
 static constexpr int MAX_STAVES  = 4;

diff --git a/libmscore/text.cpp b/libmscore/text.cpp
@@ -198,8 +198,14 @@ bool TextFragment::operator ==(const TextFragment& f) const
 
 void TextFragment::draw(QPainter* p, const Text* t) const
       {
-      p->setFont(font(t));
-      p->drawText(pos, text);
+      p->save();
+      QFont font2 = font(t);
+      font2.setPixelSize(font2.pixelSize() * DPIFACTOR);
+      p->setFont(font2);
+      qreal dpiMag = 1 / DPIFACTOR;
+      p->scale(dpiMag,dpiMag);
+      p->drawText(pos * DPIFACTOR, text);
+      p->restore();
       }
 
 //---------------------------------------------------------
@@ -297,9 +303,11 @@ void TextBlock::layout(Text* t)
       else {
             for (TextFragment& f : _text) {
                   f.pos.setX(x);
-                  QFontMetricsF fm(f.font(t));
+                  QFont font2 = f.font(t);
+                  font2.setPixelSize(font2.pixelSize() * DPIFACTOR);
+                  QFontMetricsF fm(font2);
                   if (f.format.valign() != VerticalAlignment::AlignNormal) {
-                        qreal voffset = fm.xHeight() / subScriptSize;   // use original height
+                        qreal voffset = fm.xHeight() / subScriptSize / DPIFACTOR;   // use original height
                         if (f.format.valign() == VerticalAlignment::AlignSubScript)
                               voffset *= subScriptOffset;
                         else
@@ -308,13 +316,16 @@ void TextBlock::layout(Text* t)
                         }
                   else
                         f.pos.setY(0.0);
-                  qreal w = fm.width(f.text);
+                  qreal w = fm.width(f.text) / DPIFACTOR;
                   QRectF r;
                   if (f.format.type() == CharFormatType::SYMBOL)
                         r = fm.tightBoundingRect(f.text);
                   else
                         r = fm.boundingRect(f.text);
 
+                  QSizeF rectSize = r.size() / DPIFACTOR;
+                  r.setTopLeft((r.topLeft() / DPIFACTOR).toPoint());
+                  r.setSize(rectSize.toSize());
                   // for whatever reason the boundingRect() is different
                   // on second doLayout() (paint() ?)
                   r.setX(0);        //HACK
@@ -323,7 +334,7 @@ void TextBlock::layout(Text* t)
                   _bbox |= r.translated(f.pos);
                   x += w;
                   // _lineSpacing = (_lineSpacing == 0 || fm.lineSpacing() == 0) ? qMax(_lineSpacing, fm.lineSpacing()) : qMin(_lineSpacing, fm.lineSpacing());
-                  _lineSpacing = qMax(_lineSpacing, fm.lineSpacing());
+                  _lineSpacing = qMax(_lineSpacing, rint(fm.lineSpacing() / DPIFACTOR));
                   }
             }
       qreal rx;
@@ -349,15 +360,17 @@ qreal TextBlock::xpos(int column, const Text* t) const
       for (const TextFragment& f : _text) {
             if (column == col)
                   return f.pos.x();
-            QFontMetricsF fm(f.font(t));
+            QFont font2 = f.font(t);
+            font2.setPixelSize(font2.pixelSize() * DPIFACTOR);
+            QFontMetricsF fm(font2);
             int idx = 0;
             for (const QChar& c : f.text) {
                   ++idx;
                   if (c.isHighSurrogate())
                         continue;
                   ++col;
                   if (column == col)
-                        return f.pos.x() + fm.width(f.text.left(idx));
+                        return f.pos.x() + (fm.width(f.text.left(idx)) / DPIFACTOR);
                   }
             }
       return _bbox.x();
@@ -444,8 +457,10 @@ int TextBlock::column(qreal x, Text* t) const
                   ++idx;
                   if (c.isHighSurrogate())
                         continue;
-                  QFontMetricsF fm(f.font(t));
-                  qreal xo = fm.width(f.text.left(idx));
+                  QFont font2 = f.font(t);
+                  font2.setPixelSize(font2.pixelSize() * DPIFACTOR);
+                  QFontMetricsF fm(font2);
+                  qreal xo = fm.width(f.text.left(idx)) / DPIFACTOR;
                   if (x <= f.pos.x() + px + (xo-px)*.5)
                         return col;
                   ++col;