Commit
… add tests
- Loading branch information
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3735,19 +3735,54 @@ qreal Measure::createEndBarLines(bool isLastMeasureInSystem) | |
| // if end repeat, clef goes after, otherwise clef goes before | ||
| Segment* clefSeg = findSegmentR(SegmentType::Clef, ticks()); | ||
| if (clefSeg) { | ||
| bool wasVisible = clefSeg->visible(); | ||
| int visibleInt = 0; | ||
| for (int staffIdx = 0; staffIdx < nstaves; ++staffIdx) { | ||
| int track = staffIdx * VOICES; | ||
| Clef* clef = toClef(clefSeg->element(track)); | ||
| if (clef) { | ||
| bool showCourtesy = score()->genCourtesyClef() && clef->showCourtesy(); // normally show a courtesy clef | ||
| // check if the measure is the last measure of the system or the last measure before a frame | ||
| bool lastMeasure = isLastMeasureInSystem || (nm ? !(next() == nm) : true); | ||
| if (!nm || isFinalMeasureOfSection() || (lastMeasure && !showCourtesy)) { | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
MarcSabatella
Contributor
|
||
| // hide the courtesy clef in the final measure of a section, or if the measure is the final measure of a system | ||
| // and the score style or the clef style is set to "not show courtesy clef", | ||
| // or if the clef is at the end of the very last measure of the score | ||
| clef->clear(); | ||
| clefSeg->createShape(staffIdx); | ||
| if (visibleInt == 0) | ||
| visibleInt = 1; | ||
| } | ||
| else { | ||
| clef->layout(); | ||
| clefSeg->createShape(staffIdx); | ||
| visibleInt = 2; | ||
| } | ||
| } | ||
| } | ||
| if (visibleInt == 2) // there is at least one visible clef in the clef segment | ||
| clefSeg->setVisible(true); | ||
| else if (visibleInt == 1) // all (courtesy) clefs in the clef segment are not visible | ||
| clefSeg->setVisible(false); | ||
| else // should never happen | ||
| qDebug("Clef Segment without Clef elements at tick %d/%d",clefSeg->tick().numerator(),clefSeg->tick().denominator()); | ||
| if ((wasVisible != clefSeg->visible()) && system()) // recompute the width only if necessary | ||
| computeMinWidth(); | ||
| if (seg) { | ||
| Segment* s1; | ||
| Segment* s2; | ||
| if (repeatEnd()) { | ||
| s1 = seg; | ||
| s2 = clefSeg; | ||
| } | ||
| else { | ||
| s1 = clefSeg; | ||
| s2 = seg; | ||
| } | ||
| if (s1->next() != s2) { | ||
| _segments.remove(s1); | ||
| _segments.insert(s1, s2); | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -4111,11 +4146,8 @@ void Measure::addSystemTrailer(Measure* nm) | |
| } | ||
| if (clefSegment) { | ||
| Clef* clef = toClef(clefSegment->element(track)); | ||
| if (clef) | ||
| clef->setSmall(true); | ||
| } | ||
| } | ||
| if (s) | ||
|
|
||
I think this code is probably responsible for https://musescore.org/en/node/311788 - extra space between end of staff and end barline in the presence of a courtesy clef on an invisible staff. This code seems to be setting things up to mark the clef segment visible for no obvious reason.
It would seem the "obvious" fix is to simply skip invisible staves in this loop. Somehow, we end up doing the right thing in the presence of hide empty staves but not truly invisible staves. I'm guessing that's because for hide empty staves, we actually fix this up later. I'm still working on understanding that.
But I want to check to see if I am on the right track here, since as I mentioned in my comments in the original PR here, there are often unintended consequences to changes in this part of the code, and I don't want to fix one thing only to break another because I am missing something.