Reset offset when placement is changed #25014
Open
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
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Oct 2, 2024
Backport of musescore#25014 plus 2 more small changes
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Oct 2, 2024
Backport of musescore#25014 plus 2 more small changes
Jojo-Schmitz
reviewed
Oct 2, 2024
| @@ -5374,6 +5382,7 @@ void MusicXMLParserPass2::barline(const String& partId, Measure* measure, const | |||
| } | |||
| if (fermataType == u"inverted") { | |||
| fermata->setPlacement(PlacementV::BELOW); | |||
| fermata->resetProperty(Pid::OFFSET); | |||
| } else if (fermataType == u"") { | |||
There was a problem hiding this comment.
Shouldn't this rather be
} else if (fermataType.empty()) {
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Oct 2, 2024
Backport of musescore#25014 plus 2 more small changes
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Oct 2, 2024
Backport of musescore#25014 plus 2 more small changes, one apparently an ommision from #444, which backported musescore#22577, the other stems from musescore#22740, which I haven't backported (yet). Update testPlacementOffsetDefaults_ref.mscx
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Oct 2, 2024
Backport of musescore#25014 plus 2 more small changes, one apparently an ommision from #444, which backported musescore#22577, the other stems from musescore#22740, which I haven't backported (yet, see next comit). Update testPlacementOffsetDefaults_ref.mscx Update testPlacementOffsetDefaults_ref.mscx
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.
Resolves: #24551
When
default-yandrelative-yis used to determine which side of the stave an element goes, we need to reset the offset of the element to use the correct value. In this case, make sure the offset is updated toSid::lyricsPosAbove, notSid::lyricsPosBelowas it was initialised to.