fix #113851 Placement of the multimeasure rests too high by default

musescore · Jul 8, 2016 · d56ea6e · d56ea6e
1 parent 3a795ca
commit d56ea6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -3400,9 +3400,8 @@ void Measure::stretchMeasure(qreal targetWidth)
                               qreal w = x2 - x1 - 2 * d;
 
                               rest->setMMWidth(w);
-                              StaffLines* sl = _mstaves[staffIdx]->lines;
                               qreal x = x1 - s.x() + d;
-                              e->setPos(x, sl->staffHeight() * .5);   // center vertically in measure
+                              e->setPos(x, e->staff()->height() * .5);   // center vertically in measure
                               rest->layout();
                               s.createShape(staffIdx);
                               }

diff --git a/libmscore/rest.cpp b/libmscore/rest.cpp
@@ -92,13 +92,13 @@ void Rest::draw(QPainter* painter) const
 
       painter->setPen(curColor());
 
-      if (parent() && measure() && measure()->isMMRest()) {
+      if (measure() && measure()->isMMRest()) {
             //only on voice 1
-            if ((track() % VOICES) != 0)
+            if (track() % VOICES)
                   return;
             Measure* m = measure();
             int n      = m->mmRestCount();
-            qreal pw = _spatium * .7;
+            qreal pw   = _spatium * .7;
             QPen pen(painter->pen());
             pen.setWidthF(pw);
             painter->setPen(pen);