update text editing

musescore · May 19, 2017 · 9384654 · 9384654
1 parent 847d365
commit 9384654
Show file tree

Hide file tree

Showing 19 changed files with 581 additions and 619 deletions.
diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -151,9 +151,9 @@ void Score::undoRedo(bool undo, EditData& ed)
       deselectAll();
       cmdState().reset();
       if (undo)
-            undoStack()->undo(ed);
+            undoStack()->undo(&ed);
       else
-            undoStack()->redo(ed);
+            undoStack()->redo(&ed);
       update();
       updateSelection();
       }

diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -3148,7 +3148,7 @@ void Score::undoPropertyChanged(Element* e, P_ID t, const QVariant& st)
                         // property in linked element has not changed yet
                         // push() calls redo() to change it
                         if (ee->getProperty(t) != e->getProperty(t))
-                              undoStack()->push(new ChangeProperty(ee, t, e->getProperty(t)));
+                              undoStack()->push(new ChangeProperty(ee, t, e->getProperty(t)), 0);
                         }
                   }
             }
@@ -3194,7 +3194,7 @@ void Score::undoChangePitch(Note* note, int pitch, int tpc1, int tpc2)
       {
       for (ScoreElement* e : note->linkList()) {
             Note* n = static_cast<Note*>(e);
-            undoStack()->push(new ChangePitch(n, pitch, tpc1, tpc2));
+            undoStack()->push(new ChangePitch(n, pitch, tpc1, tpc2), 0);
             }
       }
 
@@ -3213,11 +3213,11 @@ void Score::undoChangeFretting(Note* note, int pitch, int string, int fret, int
       if (l) {
             for (ScoreElement* e : *l) {
                   Note* n = static_cast<Note*>(e);
-                  undoStack()->push(new ChangeFretting(n, pitch, string, fret, tpc1, tpc2));
+                  undo(new ChangeFretting(n, pitch, string, fret, tpc1, tpc2));
                   }
             }
       else
-            undoStack()->push(new ChangeFretting(note, pitch, string, fret, tpc1, tpc2));
+            undo(new ChangeFretting(note, pitch, string, fret, tpc1, tpc2));
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -3255,9 +3255,9 @@ void Score::cmdSelectSection()
 //   undo
 //---------------------------------------------------------
 
-void Score::undo(UndoCommand* cmd) const
+void Score::undo(UndoCommand* cmd, EditData* ed) const
       {
-      undoStack()->push(cmd);
+      undoStack()->push(cmd, ed);
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/score.h b/libmscore/score.h
@@ -622,7 +622,7 @@ class Score : public QObject, ScoreElement {
       void undoPropertyChanged(Element*, P_ID, const QVariant& v);
       void undoPropertyChanged(ScoreElement*, P_ID, const QVariant& v);
       inline virtual UndoStack* undoStack() const;
-      void undo(UndoCommand* cmd) const;
+      void undo(UndoCommand*, EditData* = 0) const;
       void undoRemoveMeasures(Measure*, Measure*);
       void undoAddBracket(Staff* staff, int level, BracketType type, int span);
       void undoRemoveBracket(Bracket*);