fix #63041: editing spanner length with tuplets

musescore · Aug 15, 2015 · ed6aa2e · ed6aa2e
1 parent 4ea940f
commit ed6aa2e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -3612,7 +3612,10 @@ ChordRest* Score::findCRinStaff(int tick, int staffIdx) const
                   ChordRest* cr = static_cast<ChordRest*>(ns->element(t));
                   if (cr) {
                         int endTick = cr->tick() + cr->actualTicks();
-                        if (endTick >= lastTick && endTick <= tick) {
+                        // allow fudge factor for tuplets
+                        // TODO: replace with fraction-based calculation
+                        int fudge = cr->tuplet() ? 5 : 0;
+                        if (endTick + fudge >= lastTick && endTick - fudge <= tick) {
                               s = ns;
                               actualTrack = t;
                               lastTick = endTick;

diff --git a/libmscore/spanner.cpp b/libmscore/spanner.cpp
@@ -543,7 +543,10 @@ void Spanner::computeEndElement()
                   if (!endCR()->measure()->isMMRest()) {
                         ChordRest* cr = endCR();
                         int nticks = cr->tick() + cr->actualTicks() - _tick;
-                        if (_ticks != nticks) {
+                        // allow fudge factor for tuplets
+                        // TODO: replace with fraction-based calculation
+                        int fudge = cr->tuplet() ? 5 : 0;
+                        if (qAbs(_ticks - nticks) > fudge) {
                               qDebug("%s ticks changed, %d -> %d", name(), _ticks, nticks);
                               setTicks(nticks);
                               if (type() == Element::Type::OTTAVA)