Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #316025 - Fixed spacers do not function with vertical justification enabled #7312

Merged
merged 1 commit into from
Jan 25, 2021

Conversation

njvdberg
Copy link
Contributor

@njvdberg njvdberg commented Jan 24, 2021

Resolves: https://musescore.org/en/node/316025

When a system contains a fixed spacer, the gap above that system will become a gap with a fixed gap and no extra space will be added to this gap.
To implement this, System::minDistance() will now, instead of just saving the fixed distance, save the fixed spacer instead. distributeStaves() will use this to find out whether a system has a fixed spacer or not.

  • I signed CLA
  • I made sure the code in the PR follows the coding rules
  • I made sure the code compiles on my machine
  • I made sure there are no unnecessary changes in the code
  • I made sure the title of the PR reflects the core meaning of the issue you are solving
  • I made sure the commit message(s) contain a description and answer the question "Why do those changes fix that particular issue?" or "Why are those changes really necessary as improvements?"
  • I made sure the commit message title starts with "fix #424242:" if there is a related issue
  • I created the test (mtest, vtest, script test) to verify the changes I made

…on enabled

When a system contains a fixed spacer, the gap above that system will become
a gap with a fixed gap and no extra space will be added to this gap.

To implement this, System::minDistance() will now, instead of just saving the
fixed distance, save the fixed spacer instead. distributeStaves() will use this
to find out whether a system has a fixed spacer or not.
@MarcSabatella
Copy link
Contributor

Thanks for this! I had taken a quick look hoping there was a simple two-line fix somewhere, but soon realized it would likely mean a change to the VerticalGapData, and at that point realized I was in a little my head as far as feeling confident I'd get it right. So I can just say, this looks like the right sort of fix. Will do a test of the result and report back.

@MarcSabatella
Copy link
Contributor

Seems to work beautifully!

@vpereverzev vpereverzev merged commit 0b86e1b into musescore:3.x Jan 25, 2021
igorkorsukov added a commit to igorkorsukov/MuseScore that referenced this pull request Feb 4, 2021
igorkorsukov added a commit to igorkorsukov/MuseScore that referenced this pull request Feb 4, 2021
@njvdberg njvdberg deleted the issue-316025-spacers branch March 10, 2021 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants