fix #38766: bad input position after timesig change

musescore · Nov 11, 2014 · 280c5d9 · 280c5d9
1 parent ab6c2e6
commit 280c5d9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -431,6 +431,21 @@ bool Score::rewriteMeasures(Measure* fm, Measure* lm, const Fraction& ns)
             qFatal("Cannot write measures");
       connectTies(true);
 
+      if (noteEntryMode()) {
+            // set input cursor to possibly re-written segment
+            int icTick = inputPos();
+            Segment* icSegment = tick2segment(icTick, false, Segment::Type::ChordRest);
+            if (!icSegment) {
+                  // this can happen if cursor was on a rest
+                  // and in the rewriting it got subsumed into a full measure rest
+                  Measure* icMeasure = tick2measure(icTick);
+                  if (!icMeasure)                     // shouldn't happen, but just in case
+                        icMeasure = firstMeasure();
+                  icSegment = icMeasure->first(Segment::Type::ChordRest);
+                  }
+            inputState().setSegment(icSegment);
+            }
+
       return true;
       }
 

diff --git a/mscore/dragdrop.cpp b/mscore/dragdrop.cpp
@@ -605,6 +605,9 @@ void ScoreView::dropEvent(QDropEvent* event)
             dragElement = 0;
             setDropTarget(0); // this also resets dropRectangle and dropAnchor
             score()->endCmd();
+            // update input cursor position (must be done after layout)
+            if (noteEntryMode())
+                  moveCursor();
             mscore->endCmd();
             return;
             }