fix #11661: grace notes are not part of selection

musescore · Aug 31, 2013 · 7b5fe97 · 7b5fe97
1 parent 6abb3a6
commit 7b5fe97
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/libmscore/select.cpp b/libmscore/select.cpp
@@ -515,6 +515,9 @@ QList<Note*> Selection::noteList(int selTrack) const
                                     continue;
                               Chord* c = static_cast<Chord*>(e);
                               nl.append(c->notes());
+                              for (Chord* g : c->graceNotes()) {
+                                    nl.append(g->notes());
+                                    }
                               }
                         }
                   }

diff --git a/libmscore/transpose.cpp b/libmscore/transpose.cpp
@@ -355,12 +355,20 @@ void Score::transpose(int mode, TransposeDirection direction, int transposeKey,
                         continue;
                   Chord* chord = static_cast<Chord*>(e);
                   QList<Note*> nl = chord->notes();
-                  foreach (Note* n, nl) {
+                  for (Note* n : nl) {
                         if (mode == TRANSPOSE_DIATONICALLY)
                               n->transposeDiatonic(transposeInterval, trKeys, useDoubleSharpsFlats);
                         else
                               transpose(n, interval, useDoubleSharpsFlats);
                         }
+                  for (Chord* g : chord->graceNotes()) {
+                        for (Note* n : g->notes()) {
+                              if (mode == TRANSPOSE_DIATONICALLY)
+                                    n->transposeDiatonic(transposeInterval, trKeys, useDoubleSharpsFlats);
+                              else
+                                    transpose(n, interval, useDoubleSharpsFlats);
+                              }
+                        }
                   }
             if (transposeChordNames) {
                   foreach (Element* e, segment->annotations()) {