Commits rebased from 3.x #6379
Merged
Commits rebased from 3.x #6379
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Harmoniker1
force-pushed
the
rebased-PRs
branch
6 times, most recently
from
b065469 to
c0e01da
Compare
|
Code style check passed (the existing errors are not from this PR) |
Try to rebase, I've just fixed a number of issues. |
…with same duration This is because it doesn't check whether the time signature is local or not, so it always goes to every staff and trys to find a time signature segment, causing `nullptr`.
…perly `Pid::LINE_WIDTH` cannot be used, since it's a `qreal` value, but the value used to store the line thickness of an ambitus is a `Spatium` value, so we have to use another `Pid` which is `Spatium` type, a new one `Pid::LINE_WIDTH_SPATIUM`.
This is because the `mag()` factor isn't taken into consideration. Along with multiplying `mag()` in some places, I also created a new member function `minHeight()` for `Tremolo` class to calculate the effective height of tremolo strokes, that is, the height the strokes spread across a given vertical line, without multiplying `spatium()`, to resolve an issue of stem length (a bit longer than intended when direction is down and has single-note tremolo on it) which is not obvious in normal size but obvious in cue size. Several places are already using this effective height, so a separate function for calculating it is really convenient to use.
|
@igorkorsukov There's still one codestyle inconsistency you missed :-) I added it to this PR. |
Thanks :) |
|
Vtest failures are expected |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
From #5773, #6122, #6240, #6265.