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

fix #22559: Measure numbers, if set to all staves cannot later be unset

Browse source
This commit is contained in:
lasconic 2013-09-06 14:11:05 +02:00
parent 5232a0b6de
commit 62803b8f5e
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libmscore/measure.cpp
View file

@ -607,28 +607,24 @@ void Measure::layout2()
QString s;
if (smn)
s = QString("%1").arg(_no + 1);
int sn = 0;
int nn = 1;
if (score()->styleB(ST_measureNumberAllStaffs))
nn = n;
else {
if (!score()->styleB(ST_measureNumberAllStaffs)) {
//find first non invisible staff
for (int staffIdx = 0; staffIdx < n; ++staffIdx) {
MStaff* ms = staves.at(staffIdx);
SysStaff* s = system()->staff(staffIdx);
Staff* staff = score()->staff(staffIdx);
if (ms->visible() && staff->show() && s->show()) {
sn = staffIdx;
nn = staffIdx + 1;
nn = staffIdx;
break;
}
}
}
for (int staffIdx = sn; staffIdx < nn; ++staffIdx) {
for (int staffIdx = 0; staffIdx < n; ++staffIdx) {
MStaff* ms = staves.at(staffIdx);
Text* t = ms->noText();
if (smn) {
if (t == 0) {
if (t == 0 && (staffIdx == nn || score()->styleB(ST_measureNumberAllStaffs))) {
t = new Text(score());
t->setFlag(ELEMENT_ON_STAFF, true);
t->setTrack(staffIdx * VOICES);
@ -637,9 +633,11 @@ void Measure::layout2()
t->setParent(this);
score()->undoAddElement(t);
}
t->setText(s);
t->layout();
smn = score()->styleB(ST_measureNumberAllStaffs);
if(t) {
t->setText(s);
t->layout();
smn = score()->styleB(ST_measureNumberAllStaffs);
}
}
else {
if (t)