Merge pull request #5758 from mattmcclinch/301605-add-slur

fix #301605: Undoing slur addition to a range only removes one slur
musescore · Feb 27, 2020 · ed32c5b · ed32c5b
2 parents 8e00f8b + 7e185d2
commit ed32c5b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/libmscore/mscoreview.h b/libmscore/mscoreview.h
@@ -57,7 +57,7 @@ class MuseScoreView {
       virtual QCursor cursor() const { return QCursor(); }
       virtual void setCursor(const QCursor&) {};
       virtual void setDropRectangle(const QRectF&) {};
-      virtual void cmdAddSlur(ChordRest*, ChordRest*, const Slur* /* slurTemplate */) {};
+      virtual void addSlur(ChordRest*, ChordRest*, const Slur* /* slurTemplate */) {};
       virtual void startEdit(Element*, Grip /*startGrip*/) {};
       virtual void startNoteEntryMode() {};
       virtual void drawBackground(QPainter*, const QRectF&) const = 0;

diff --git a/libmscore/note.cpp b/libmscore/note.cpp
@@ -1625,7 +1625,7 @@ Element* Note::drop(EditData& data)
                   return 0;
 
             case ElementType::SLUR:
-                  data.view->cmdAddSlur(chord(), nullptr, toSlur(e));
+                  data.view->addSlur(chord(), nullptr, toSlur(e));
                   delete e;
                   return 0;
 

diff --git a/mscore/palette.cpp b/mscore/palette.cpp
@@ -550,7 +550,7 @@ bool Palette::applyPaletteElement(Element* element, Qt::KeyboardModifiers modifi
                   score->cmdToggleLayoutBreak(breakElement->layoutBreakType());
                   }
             else if (element->isSlur() && addSingle) {
-                  viewer->addSlur(toSlur(element));
+                  viewer->cmdAddSlur(toSlur(element));
                   }
             else if (element->isSLine() && !element->isGlissando() && addSingle) {
                   Segment* startSegment = cr1->segment();
@@ -702,7 +702,7 @@ bool Palette::applyPaletteElement(Element* element, Qt::KeyboardModifiers modifi
                         }
                   }
             else if (element->isSlur()) {
-                  viewer->addSlur(toSlur(element));
+                  viewer->cmdAddSlur(toSlur(element));
                   }
             else if (element->isSLine() && element->type() != ElementType::GLISSANDO) {
                   Segment* startSegment = sel.startSegment();

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -1877,7 +1877,7 @@ void ScoreView::cmd(const char* s)
                         cv->changeState(ViewState::NORMAL);
                   }},
             {{"add-slur"}, [](ScoreView* cv, const QByteArray&) {
-                  cv->addSlur();
+                  cv->cmdAddSlur();
                   }},
             {{"add-hairpin"}, [](ScoreView* cv, const QByteArray&) {
                   cv->cmdAddHairpin(HairpinType::CRESC_HAIRPIN);
@@ -3551,11 +3551,11 @@ void ScoreView::startUndoRedo(bool undo)
       }
 
 //---------------------------------------------------------
-//   addSlur
+//   cmdAddSlur
 //    command invoked, or icon double clicked
 //---------------------------------------------------------
 
-void ScoreView::addSlur(const Slur* slurTemplate)
+void ScoreView::cmdAddSlur(const Slur* slurTemplate)
       {
       InputState& is = _score->inputState();
       if (noteEntryMode() && is.slur()) {
@@ -3568,6 +3568,9 @@ void ScoreView::addSlur(const Slur* slurTemplate)
             is.setSlur(nullptr);
             return;
             }
+
+      _score->startCmd();
+
       ChordRest* cr1;
       ChordRest* cr2;
       const auto& sel = _score->selection();
@@ -3593,7 +3596,7 @@ void ScoreView::addSlur(const Slur* slurTemplate)
                               cr2 = cr;
                         }
                   if (cr1 && (cr1 != cr2))
-                        cmdAddSlur(cr1, cr2, slurTemplate);
+                        addSlur(cr1, cr2, slurTemplate);
                   }
             }
       else {
@@ -3613,15 +3616,16 @@ void ScoreView::addSlur(const Slur* slurTemplate)
             if (cr1 == cr2)
                   cr2 = 0;
             if (cr1)
-                  cmdAddSlur(cr1, cr2, slurTemplate);
+                  addSlur(cr1, cr2, slurTemplate);
             }
+      _score->endCmd();
       }
 
 //---------------------------------------------------------
-//   cmdAddSlur
+//   addSlur
 //---------------------------------------------------------
 
-void ScoreView::cmdAddSlur(ChordRest* cr1, ChordRest* cr2, const Slur* slurTemplate)
+void ScoreView::addSlur(ChordRest* cr1, ChordRest* cr2, const Slur* slurTemplate)
       {
       bool switchToSlur = false;
       if (cr2 == 0) {
@@ -3631,8 +3635,6 @@ void ScoreView::cmdAddSlur(ChordRest* cr1, ChordRest* cr2, const Slur* slurTempl
             switchToSlur = true; // select slur for editing if last chord is not given
             }
 
-      _score->startCmd();
-
       Slur* slur = slurTemplate ? slurTemplate->clone() : new Slur(cr1->score());
       slur->setScore(cr1->score());
       slur->setTick(cr1->tick());
@@ -3652,8 +3654,6 @@ void ScoreView::cmdAddSlur(ChordRest* cr1, ChordRest* cr2, const Slur* slurTempl
             ss->setSlurOffset(Grip::END, QPointF(3.0 * cr1->score()->spatium(), 0.0));
       slur->add(ss);
 
-      _score->endCmd();
-
       if (noteEntryMode()) {
             _score->inputState().setSlur(slur);
             ss->setSelected(true);

diff --git a/mscore/scoreview.h b/mscore/scoreview.h
@@ -335,8 +335,8 @@ class ScoreView : public QWidget, public MuseScoreView {
       void doDragEdit(QMouseEvent* ev);
       bool testElementDragTransition(QMouseEvent* ev);
       bool fotoEditElementDragTransition(QMouseEvent* ev);
-      void addSlur(const Slur* slurTemplate = nullptr);
-      void cmdAddSlur(ChordRest*, ChordRest*, const Slur*) override;
+      void cmdAddSlur(const Slur* slurTemplate = nullptr);
+      void addSlur(ChordRest*, ChordRest*, const Slur*) override;
       virtual void cmdAddHairpin(HairpinType);
       void cmdAddNoteLine();