Disable most toolbar editing options for trill cue notes #19304
Merged
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
oktophonie
approved these changes
Sep 11, 2023
miiizen
force-pushed
the
18330-edit-trill-notes
branch
from
3d077cb
to
f122fa4
Compare
| @@ -1994,7 +1995,7 @@ void NotationInteraction::doAddSlur(const mu::engraving::Slur* slurTemplate) | |||
| secondChordRest = mu::engraving::nextChordRest(firstChordRest); | |||
| } | |||
|
|
|||
| if (firstChordRest) { | |||
| if (firstChordRest && !(firstChordRest->isTrillCueNote() || secondChordRest->isTrillCueNote())) { | |||
There was a problem hiding this comment.
I'm not sure but it might be wise to add a null check for secondChordRest here...
Suggested change
| if (firstChordRest && !(firstChordRest->isTrillCueNote() || secondChordRest->isTrillCueNote())) { | |
| if (firstChordRest && !(firstChordRest->isTrillCueNote() || (secondChordRest && secondChordRest->isTrillCueNote()))) { |
(Inside doAddSlur, it seems not bad if secondChordRest is null, but for performing this check itself, it does matter of course.)
There was a problem hiding this comment.
Just tried it out: indeed a null check is necessary. (add a trill to the very last note of a score, and try to add a slur between the main note and the trill cue note)
| @@ -1965,12 +1965,13 @@ void NotationInteraction::doAddSlur(const mu::engraving::Slur* slurTemplate) | |||
| } | |||
| } | |||
|
|
|||
| if (firstChordRest && (firstChordRest != secondChordRest)) { | |||
| if (firstChordRest && (firstChordRest != secondChordRest) | |||
| && !(firstChordRest->isTrillCueNote() || secondChordRest->isTrillCueNote())) { | |||
There was a problem hiding this comment.
Maybe here too actually
Suggested change
| && !(firstChordRest->isTrillCueNote() || secondChordRest->isTrillCueNote())) { | |
| && !(firstChordRest->isTrillCueNote() || (secondChordRest && secondChordRest)->isTrillCueNote())) { |
miiizen
force-pushed
the
18330-edit-trill-notes
branch
from
f122fa4
to
a7d8393
Compare
src/engraving/dom/chordrest.cpp
Outdated
| if (isChord()) { | ||
| m_isTrillCueNote = v; | ||
| } else { | ||
| m_isTrillCueNote = false; |
There was a problem hiding this comment.
This looks too weird. It should be in the Chord class. Also, for setters, you would expect them to always change the current value, not under some conditions...
miiizen
force-pushed
the
18330-edit-trill-notes
branch
from
40387af
to
ec8663d
Compare
miiizen
force-pushed
the
18330-edit-trill-notes
branch
from
ec8663d
to
fa0d0f5
Compare
cbjeukendrup
approved these changes
Nov 9, 2023
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: #18330
Disable editing trill cue note:
and make behaviour when trying to make the cue note a triplet consistent with grace notes (ie. does nothing)