fix #280208: hairpin should not normally cross barline to meet note

musescore · Dec 17, 2018 · 041a4af · 041a4af
1 parent c63d1c4
commit 041a4af
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/libmscore/hairpin.cpp b/libmscore/hairpin.cpp
@@ -112,9 +112,8 @@ void HairpinSegment::layout()
                         const qreal edLeft  = ed->bbox().left() + ed->pos().x()
                                               + ed->segment()->pos().x() + ed->measure()->pos().x();
                         const qreal dist    = edLeft - pos2().x() - pos().x() - score()->styleP(Sid::autoplaceHairpinDynamicsDistance);
-                        rxpos2() += dist;
-                        // TODO - don't extend hairpin across barline to reach dynamic in next measure?
-                        // or only if there is also a key signature? see Gould
+                        if (dist < 0.0 || dist >= 3.0 * spatium())
+                              rxpos2() += dist;
                         }
                   }
             }