Skip to content

Commit

Permalink
Merge pull request #19316 from mmeyn/18798-system-brackets-hidden-staves
Browse files Browse the repository at this point in the history
Fix #18798: corrects system bracket display in continuous view
  • Loading branch information
cbjeukendrup authored Sep 14, 2023
2 parents 72aadfb + 56fa3cc commit eb641ae
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/engraving/rendering/dev/scorehorizontalviewlayout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -344,5 +344,7 @@ void ScoreHorizontalViewLayout::collectLinearSystem(LayoutContext& ctx)
MeasureLayout::getNextMeasure(ctx);
}

SystemLayout::hideEmptyStaves(system, ctx, true);

system->setWidth(pos.x());
}
3 changes: 2 additions & 1 deletion src/engraving/rendering/dev/systemlayout.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ class SystemLayout

static void layoutSystem(System* system, LayoutContext& ctx, double xo1, bool isFirstSystem = false, bool firstSystemIndent = false);

static void hideEmptyStaves(System* system, LayoutContext& ctx, bool isFirstSystem);

static void layout2(System* system, LayoutContext& ctx);
static void restoreLayout2(System* system, LayoutContext& ctx);
static void setMeasureHeight(System* system, double height, LayoutContext& ctx);
Expand All @@ -59,7 +61,6 @@ class SystemLayout

private:
static System* getNextSystem(LayoutContext& lc);
static void hideEmptyStaves(System* system, LayoutContext& ctx, bool isFirstSystem);
static void processLines(System* system, LayoutContext& ctx, std::vector<Spanner*> lines, bool align);
static void layoutTies(Chord* ch, System* system, const Fraction& stick);
static void doLayoutTies(System* system, std::vector<Segment*> sl, const Fraction& stick, const Fraction& etick);
Expand Down

0 comments on commit eb641ae

Please sign in to comment.