LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #42541: drum grace notes laid out incorrectly on load

Browse source
This commit is contained in:
Marc Sabatella 2014-12-27 18:40:57 -07:00
parent be05ea4582
commit 036a6f9975
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libmscore/chord.cpp
View file

@ -1629,9 +1629,11 @@ void Chord::cmdUpdateNotes(AccidentalState* as)
int gnb = getGraceNotesBefore(&graceNotesBefore);
if (gnb) {
for (Chord* ch : graceNotesBefore) {
QList<Note*> notes(ch->notes()); // we need a copy!
for (Note* note : notes)
note->updateAccidental(as);
if (staffGroup != StaffGroup::PERCUSSION) {
QList<Note*> notes(ch->notes()); // we need a copy!
for (Note* note : notes)
note->updateAccidental(as);
}
ch->sortNotes();
}
}
@ -1664,13 +1666,16 @@ void Chord::cmdUpdateNotes(AccidentalState* as)
}
}
}
QList<Chord*> graceNotesAfter;
int gna = getGraceNotesAfter(&graceNotesAfter);
if (gna) {
for (Chord* ch : graceNotesAfter) {
QList<Note*> notes(ch->notes()); // we need a copy!
for (Note* note : notes)
note->updateAccidental(as);
if (staffGroup != StaffGroup::PERCUSSION) {
QList<Note*> notes(ch->notes()); // we need a copy!
for (Note* note : notes)
note->updateAccidental(as);
}
ch->sortNotes();
}
}

2
libmscore/note.cpp
View file

@ -1923,7 +1923,7 @@ int Note::line() const
}
//---------------------------------------------------------
// setLine
// setAccidentalType
//---------------------------------------------------------
void Note::setAccidentalType(Accidental::Type type)