Merge pull request #5009 from MarcSabatella/288993-cross-staff-skylines

fix #288993: bad skyline for cross staff articulations and stems
musescore · May 11, 2019 · 5bcdea8 · 5bcdea8
2 parents c066b6b + ec64498
commit 5bcdea8
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/libmscore/chord.cpp b/libmscore/chord.cpp
@@ -3157,8 +3157,11 @@ Shape Chord::shape() const
       Shape shape;
       if (_hook && _hook->addToSkyline())
             shape.add(_hook->shape().translated(_hook->pos()));
-      if (_stem && _stem->addToSkyline())
-            shape.add(_stem->shape().translated(_stem->pos()));
+      if (_stem && _stem->addToSkyline()) {
+            // stem direction is not known soon enough for cross staff beamed notes
+            if (!(beam() && (staffMove() || beam()->cross())))
+                  shape.add(_stem->shape().translated(_stem->pos()));
+            }
       if (_stemSlash && _stemSlash->addToSkyline())
             shape.add(_stemSlash->shape().translated(_stemSlash->pos()));
       if (_arpeggio && _arpeggio->addToSkyline())
@@ -3391,7 +3394,7 @@ void Chord::layoutArticulations2()
                   QRectF r = a->bbox().translated(a->pos() + pos());
                   s->staffShape(staffIdx()).add(r);
                   r = a->bbox().translated(a->pos() + pos() + s->pos() + m->pos());
-                  m->system()->staff(staffIdx())->skyline().add(r);
+                  m->system()->staff(vStaffIdx())->skyline().add(r);
                   }
             }
       }
@@ -3413,7 +3416,7 @@ void Chord::layoutArticulations3(Slur* slur)
             return;
       Segment* s = segment();
       Measure* m = measure();
-      SysStaff* sstaff = m->system() ? m->system()->staff(staffIdx()) : nullptr;
+      SysStaff* sstaff = m->system() ? m->system()->staff(vStaffIdx()) : nullptr;
       for (Articulation* a : _articulations) {
             if (a->layoutCloseToNote() || !a->autoplace() || !slur->addToSkyline())
                   continue;