fix #60746: bad symbol position on drag & drop

musescore · May 18, 2015 · c988a85 · c988a85
1 parent 669aea8
commit c988a85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mscore/dragdrop.cpp b/mscore/dragdrop.cpp
@@ -500,12 +500,13 @@ void ScoreView::dropEvent(QDropEvent* event)
                         if (el == 0 || el->type() == Element::Type::MEASURE) {
                               int staffIdx;
                               Segment* seg;
-                              el = _score->pos2measure(pos, &staffIdx, 0, &seg, 0);
+                              QPointF offset;
+                              el = _score->pos2measure(pos, &staffIdx, 0, &seg, &offset);
                               if (el && el->type() == Element::Type::MEASURE) {
                                     dragElement->setTrack(staffIdx * VOICES);
                                     dragElement->setParent(seg);
                                     if (applyUserOffset)
-                                          dragElement->setUserOff(pos - seg->canvasPos());
+                                          dragElement->setUserOff(offset);
                                     score()->undoAddElement(dragElement);
                                     }
                               else {

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -1089,9 +1089,8 @@ void ScoreView::measurePopup(const QPoint& gpos, Measure* obj)
       int staffIdx;
       int pitch;
       Segment* seg;
-      QPointF offset;
 
-      if (!_score->pos2measure(data.startMove, &staffIdx, &pitch, &seg, &offset))
+      if (!_score->pos2measure(data.startMove, &staffIdx, &pitch, &seg, 0))
             return;
       if (staffIdx == -1) {
             qDebug("ScoreView::measurePopup: staffIdx == -1!");