Layout articulations in shadowNote as done in chordLayout #32089
+131
−32
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, in part: #14815
Towards parts 4-6 of that issue, this changes the
ShadowNote::drawArticulationsmethod to layout articulations similarly to how theChordLayout::layoutArticulationsfunctions do, albeit assuming default styling and treating the shadow note independently (rather than accessing a LayoutContext or other objects).The methods it called,
drawArticulationanddrawMarcato, were replaced withdrawCloseArticulation(for staccato and tenuto) anddrawFarArticulation(including marcato, accent, and laissez-vibrer), based on (an equivalent to)*Articulation::layoutCloseToNote, because those categories are treated differently in chordLayout.*(
layoutCloseToNoteitself is not used, as the ShadowNote has a set of SymIds, not real articulations in the DOM).Tested with staccato, tenuto, marcato, and accent.⚠️ Notably not tested with laissez-vibrer: those would still be drawn where 1cb862b left them drawn, and are not accounted for by staccato and tenuto marks - but it seems that laissez-vibrer isn't an option for the shadow note's note input method currently.