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

fix tests

Browse source
This commit is contained in:
Marc Sabatella 2014-04-14 12:35:02 -06:00
parent e3f61177bb
commit 448ff548d0
3 changed files with 227 additions and 358 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmscore/measure.cpp
View file

@ -3172,6 +3172,8 @@ void Measure::layoutX(qreal stretch)
sp += clefKeyRightMargin - bnd;
minDistance = qMax(minDistance, sp);
}
else if (pt & Segment::SegTimeSig)
minDistance = qMax(minDistance, clefKeyRightMargin);
}
else if (pt & (Segment::SegChordRest)) {
minDistance = qMax(minDistance, minNoteDistance);

579
mtest/libmscore/measure/measure-2.mscx
View file

File diff suppressed because it is too large Load diff

4
mtest/libmscore/measure/tst_measure.cpp
View file

@ -184,10 +184,10 @@ void TestMeasure::minWidth()
score->doLayout();
//QCOMPARE(mw1, m1->minWidth1());
//QCOMPARE(mw2, m2->minWidth1());
printf("m1: %f / %f\n", mw1, m1->minWidth1());
printf("m2: %f / %f\n", mw2, m2->minWidth1());
QCOMPARE(mw1, m1->minWidth1());
QCOMPARE(mw2, m2->minWidth1());
// after second layout nothing should be changed:
for (int i = 0; i < n; ++i) {