fix tests
This commit is contained in:
parent
e3f61177bb
commit
448ff548d0
3 changed files with 227 additions and 358 deletions
|
@ -3172,6 +3172,8 @@ void Measure::layoutX(qreal stretch)
|
||||||
sp += clefKeyRightMargin - bnd;
|
sp += clefKeyRightMargin - bnd;
|
||||||
minDistance = qMax(minDistance, sp);
|
minDistance = qMax(minDistance, sp);
|
||||||
}
|
}
|
||||||
|
else if (pt & Segment::SegTimeSig)
|
||||||
|
minDistance = qMax(minDistance, clefKeyRightMargin);
|
||||||
}
|
}
|
||||||
else if (pt & (Segment::SegChordRest)) {
|
else if (pt & (Segment::SegChordRest)) {
|
||||||
minDistance = qMax(minDistance, minNoteDistance);
|
minDistance = qMax(minDistance, minNoteDistance);
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -184,10 +184,10 @@ void TestMeasure::minWidth()
|
||||||
|
|
||||||
score->doLayout();
|
score->doLayout();
|
||||||
|
|
||||||
//QCOMPARE(mw1, m1->minWidth1());
|
|
||||||
//QCOMPARE(mw2, m2->minWidth1());
|
|
||||||
printf("m1: %f / %f\n", mw1, m1->minWidth1());
|
printf("m1: %f / %f\n", mw1, m1->minWidth1());
|
||||||
printf("m2: %f / %f\n", mw2, m2->minWidth1());
|
printf("m2: %f / %f\n", mw2, m2->minWidth1());
|
||||||
|
QCOMPARE(mw1, m1->minWidth1());
|
||||||
|
QCOMPARE(mw2, m2->minWidth1());
|
||||||
|
|
||||||
// after second layout nothing should be changed:
|
// after second layout nothing should be changed:
|
||||||
for (int i = 0; i < n; ++i) {
|
for (int i = 0; i < n; ++i) {
|
||||||
|
|
Loading…
Reference in a new issue