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

Merge pull request #2065 from MarcSabatella/65041-breath-harmony

Browse source 
fix #65041: breath interferes with chord symbol spacing
This commit is contained in:
Nicolas Froment 2015-06-13 10:57:17 +02:00
commit 75fa4d05c0
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libmscore/layout.cpp
View file

@ -3970,15 +3970,14 @@ qreal Score::computeMinWidth(Segment* fs, bool firstMeasureInSystem)
rest2[staffIdx] = true;
// space chord symbols separately from segments
if (hFound || eFound) {
if (hFound || spaceHarmony) {
qreal sp = 0.0;
// space chord symbols unless they miss each other vertically
if (hFound && hBbox.top() < hLastBbox[staffIdx].bottom() && hBbox.bottom() > hLastBbox[staffIdx].top())
sp = hRest[staffIdx] + minHarmonyDistance + hSpace.lw();
// barline: limit space to maxHarmonyBarDistance
else if (eFound && !hFound && spaceHarmony)
else if (spaceHarmony)
sp = qMin(hRest[staffIdx], maxHarmonyBarDistance);
hLastBbox[staffIdx] = hBbox;

5
libmscore/measure.cpp
View file

@ -3413,15 +3413,14 @@ void Measure::layoutX(qreal stretch)
rest2[staffIdx] = true;
// space chord symbols separately from segments
if (hFound || eFound) {
if (hFound || spaceHarmony) {
qreal sp = 0.0;
// space chord symbols unless they miss each other vertically
if (hFound && hBbox.top() < hLastBbox[staffIdx].bottom() && hBbox.bottom() > hLastBbox[staffIdx].top())
sp = hRest[staffIdx] + minHarmonyDistance + hSpace.lw();
// barline: limit space to maxHarmonyBarDistance
else if (eFound && spaceHarmony)
else if (spaceHarmony)
sp = qMin(hRest[staffIdx], maxHarmonyBarDistance);
hLastBbox[staffIdx] = hBbox;

3
vtest/gen
View file

@ -45,7 +45,8 @@ else
accidental-1 accidental-2 accidental-3 accidental-4 accidental-5\
accidental-6 accidental-7 accidental-8 accidental-9 accidental-10\
tie-1 tie-2 tie-3 grace-1 grace-2 grace-3 grace-4 tuplets-1 tuplets-2 breath-1\
harmony-1 harmony-2 harmony-3 harmony-4 harmony-5 harmony-6 harmony-7 harmony-8 harmony-9 harmony-10 harmony-11\
harmony-1 harmony-2 harmony-3 harmony-4 harmony-5 harmony-6 harmony-7
harmony-8 harmony-9 harmony-10 harmony-11 harmony-12\
beams-1 beams-2 beams-3 beams-4 beams-5 beams-6 beams-7 beams-8 beams-9 beams-10\
beams-11 beams-12 beams-13 beams-14 beams-15 beams-16 beams-17\
user-offset-1 user-offset-2 chord-space-1 chord-space-2 tablature-1 image-1\

3
vtest/gen.bat
View file

@ -20,7 +20,8 @@ set SRC=mmrest-1,bravura-mmrest,gonville-mmrest,mmrest-2,mmrest-4,mmrest-5,mmres
accidental-1,accidental-2,accidental-3,accidental-4,accidental-5, ^
accidental-6,accidental-7,accidental-8,accidental-9,accidental-10, ^
tie-1,tie-2,tie-3,grace-1,grace-2,grace-3,grace-4,tuplets-1,tuplets-2,breath-1, ^
harmony-1,harmony-2,harmony-3,harmony-4,harmony-5,harmony-6,harmony-7,harmony-8,harmony-9,harmony-10,harmony-11, ^
harmony-1,harmony-2,harmony-3,harmony-4,harmony-5,harmony-6,harmony-7, ^
harmony-8,harmony-9,harmony-10,harmony-11,harmony-12, ^
beams-1,beams-2,beams-3,beams-4,beams-5,beams-6,beams-7,beams-8,beams-9,beams-10, ^
beams-11,beams-12,beams-13,beams-14,beams-15,beams-16,beams-17, ^
user-offset-1,user-offset-2,chord-space-1,chord-space-2,tablature-1,image-1, ^

BIN
vtest/harmony-12-ref.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
vtest/harmony-12.mscz Normal file
View file

Binary file not shown.