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

fix multimeasure rests and hidden part (2)

Browse source
This commit is contained in:
lasconic 2014-03-03 16:50:45 +01:00
parent 3af29a9555
commit fdf255abc1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmscore/layout.cpp
View file

@ -954,7 +954,7 @@ static bool validMMRestMeasure(Measure* m)
}
for (Segment* s = m->first(); s; s = s->next()) {
for (Element* e : s->annotations()) {
if (e->systemFlag() || m->score()->staff(e->staffIdx())->show())
if(e->type() != Element::REHEARSAL_MARK && e->type() != Element::TEMPO_TEXT && e->type() != Element::STAFF_TEXT)
return false;
}
}
@ -984,7 +984,7 @@ static bool breakMultiMeasureRest(Measure* m)
for (Element* e : s->annotations()) {
if (e->type() == Element::REHEARSAL_MARK ||
e->type() == Element::TEMPO_TEXT ||
e->type() == Element::STAFF_TEXT)
(e->type() == Element::STAFF_TEXT && (e->systemFlag() || m->score()->staff(e->staffIdx())->show())))
return true;
}
}