fix #65331 Bad screen scaling if staff scaled to 50% and zoom set to …

…200%
musescore · Jun 17, 2015 · 345e6ff · 345e6ff
1 parent 6d09138
commit 345e6ff
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/libmscore/clef.cpp b/libmscore/clef.cpp
@@ -348,7 +348,7 @@ void Clef::draw(QPainter* painter) const
             return;
       QColor color(curColor());
       foreach(Element* e, elements) {
-            e->setColor(color);
+            e->setColor(color);           //??
             QPointF pt(e->pos());
             painter->translate(pt);
             e->draw(painter);

diff --git a/libmscore/sym.cpp b/libmscore/sym.cpp
@@ -5290,9 +5290,14 @@ SymId Sym::userName2id(const QString& s)
       return (val == -1) ? SymId::noSym : (SymId)(val);
       }
 
+//---------------------------------------------------------
+//   GlyphKey operator==
+//---------------------------------------------------------
+
 bool GlyphKey::operator==(const GlyphKey& k) const
       {
-      return id == k.id && mag == k.mag && color == k.color;
+      return (face == k.face) && (id == k.id)
+         && (mag == k.mag) && (worldScale == k.worldScale) && (color == k.color);
       }
 
 //---------------------------------------------------------
@@ -5328,7 +5333,6 @@ void ScoreFont::draw(SymId id, QPainter* painter, qreal mag, const QPointF& pos,
                         qDebug("Mscore: fatal error: cannot load internal font <%s>", qPrintable(s));
                         return;
                         }
-                  printf("load <%s> <%s>\n", qPrintable(s), qPrintable(_family));
                   font = new QFont;
                   font->setWeight(QFont::Normal);
                   font->setItalic(false);
@@ -5355,7 +5359,7 @@ void ScoreFont::draw(SymId id, QPainter* painter, qreal mag, const QPointF& pos,
             worldScale = 1.0;
       int scale16      = lrint(worldScale * 6553.6 * mag);
 
-      GlyphKey gk(id, scale16, color);
+      GlyphKey gk(face, id, mag, worldScale, color);
       GlyphPixmap* pm = cache->object(gk);
       if (!pm) {
             FT_Matrix matrix {

diff --git a/libmscore/sym.h b/libmscore/sym.h
@@ -2592,12 +2592,15 @@ class Sym {
 //---------------------------------------------------------
 
 struct GlyphKey {
+      FT_Face face;
       SymId id;
-      int mag;
+      qreal mag;
+      qreal worldScale;
       QColor color;
 
    public:
-      GlyphKey(SymId _id, int m, QColor c) : id(_id), mag(m), color(c) {}
+      GlyphKey(FT_Face _f, SymId _id, float m, float s, QColor c)
+         : face(_f), id(_id), mag(m), worldScale(s), color(c) {}
       bool operator==(const GlyphKey&) const;
       };
 

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -2316,7 +2316,7 @@ void ScoreView::drawElements(QPainter& painter, const QList<Element*>& el)
 
 void ScoreView::setMag(qreal nmag)
       {
-      qreal m = mag();
+      qreal m = _matrix.m11();
 
       if (nmag == m)
             return;