fix trill rendering

musescore · May 7, 2015 · f6b88f1 · f6b88f1
1 parent 64d9689
commit f6b88f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/libmscore/sym.h b/libmscore/sym.h
@@ -2553,7 +2553,6 @@ inline uint qHash(const GlyphKey& k)
       return (int(k.id) << 16) + int(k.mag*1000);
       }
 
-
 //---------------------------------------------------------
 //   ScoreFont
 //---------------------------------------------------------
@@ -2599,6 +2598,7 @@ class ScoreFont {
 
       qreal height(SymId id, qreal mag) const         { return sym(id).bbox().height() * mag; }
       qreal width(SymId id, qreal mag) const          { return sym(id).bbox().width() * mag;  }
+      qreal advance(SymId id, qreal mag) const        { return sym(id).advance() * mag;  }
       qreal width(const QList<SymId>&, qreal mag) const;
 
       const QRectF bbox(SymId id, qreal mag) const;

diff --git a/libmscore/trill.cpp b/libmscore/trill.cpp
@@ -86,8 +86,10 @@ void TrillSegment::symbolLine(SymId start, SymId fill)
 
       _symbols.clear();
       _symbols.append(start);
-      qreal w1 = f->bbox(start, mag).width();
-      qreal w2 = f->width(fill, mag);
+//      qreal w1 = f->bbox(start, mag).width();
+//      qreal w2 = f->width(fill, mag);
+      qreal w1 = f->advance(start, mag);
+      qreal w2 = f->advance(fill, mag);
       int n    = lrint((w - w1) / w2);
       for (int i = 0; i < n; ++i)
            _symbols.append(fill);