Skip to content

Commit

Permalink
Merge pull request #25420 from sammik/courtesy-keysig-before-frame
Browse files Browse the repository at this point in the history
add courtesy keysig to last measure even if it is followed by frame
  • Loading branch information
mike-spa authored Dec 17, 2024
2 parents 8fc3c78 + 04f5687 commit b532152
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/engraving/rendering/score/systemlayout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -330,11 +330,9 @@ System* SystemLayout::collectSystem(LayoutContext& ctx)
* **********************************************************/

// Brake cross-measure beams
// Create end barlines
if (ctx.state().prevMeasure() && ctx.state().prevMeasure()->isMeasure()) {
Measure* pm = toMeasure(ctx.mutState().prevMeasure());
BeamLayout::breakCrossMeasureBeams(pm, ctx);
MeasureLayout::createEndBarLines(pm, true, ctx);
}

// hide empty staves
Expand All @@ -345,9 +343,10 @@ System* SystemLayout::collectSystem(LayoutContext& ctx)
SystemLayout::layoutSystem(system, ctx, layoutSystemMinWidth, ctx.state().firstSystem(), ctx.state().firstSystemIndent());
curSysWidth += system->leftMargin();

// add system trailer if needed (cautionary time/key signatures etc)
// Create end barlines and system trailer if needed (cautionary time/key signatures etc)
Measure* lm = system->lastMeasure();
if (lm) {
MeasureLayout::createEndBarLines(lm, true, ctx);
Measure* nm = lm->nextMeasure();
if (nm) {
MeasureLayout::addSystemTrailer(lm, nm, ctx);
Expand Down

0 comments on commit b532152

Please sign in to comment.