add clefs, keysigs, and timesigs by double click #2104
Conversation
| @@ -276,7 +282,7 @@ static void applyDrop(Score* score, ScoreView* viewer, Element* target, Element* | |||
| DropData dropData; | |||
| dropData.view = viewer; | |||
| dropData.pos = pt; | |||
| dropData.dragOffset = pt; | |||
| dropData.dragOffset = QPointF(); | |||
There was a problem hiding this comment.
I'm not actually sure about this; maybe I should have left it alone. It's only used for symbols apparently?
There was a problem hiding this comment.
It seems that either way, the one case where it seems relevant doesn't work right: adding a symbol to another symbol via double click. The problem is that neither pos nor dragOffset will have meaningful values in that case - they are both set to 0. Seems we really need to set pt the same way here as in the code below for measures - we need the beginning-of-score-relative position of the target, since that is what drop() relies on. But it's not directly relevant to my changes here.
There was a problem hiding this comment.
Further investigation led me to discover that target->pagePos() is actually good here. I guess it needs to be score-relative only for measures, page-relative for everything else? So I have updated this.
|
Also added support for MARKER / JUMP (segno, coda, dc al fine, etc), and fixed a small issue with interpretation of position when adding a symbol to another symbol. I guess these two commits will need to be squashed, but I'm leaving them as is for now so the line notes I added will still be valid, in case anyone has any comments. |
|
This PR now supports all the palette elements I can think of that formerly required drag & drop. Most simply use the existing code for barlines (improved to loop through measures). Only clefs, keysigs, and timesigs have or need the special handling to restore the original at the end of the selection. |
| if (element->type() == Element::Type::CLEF) { | ||
| if (sel.startSegment()->segmentType() == Segment::Type::ChordRest && sel.startSegment()->rtick() != 0) { | ||
| ChordRest* cr = static_cast<ChordRest*>(sel.startSegment()->element(i * VOICES)); | ||
| if (cr->isChord()) |
There was a problem hiding this comment.
What about if cr && cr->isChord() ?
There was a problem hiding this comment.
Ooops, yes, seems it would crash with different rhythms on different staves and mid-measure clef changes. I should probably find the next cr. I'll make that change and squah/rebase a bit later, also see if you find anything else that needs fixing.
MarcSabatella
force-pushed
the
double-click-clef-keysig-timesig
branch
from
e70f017
to
2d041c9
Compare
|
Fixed the crash on cr == 0 when adding clefs to a multi-staff selection, and squashed commits. |
…timesig add clefs, keysigs, and timesigs by double click
This change allows you to add clefs, key signatures, and time signatures by selecting a range and double clicking the palette icon. If the range is exactly one full measure, then only that change is inserted - so the change lasts until the end of the score. If it is longer (or shorter), then the original clef / keysig / timesig is restored at the end of the selection. For clefs, mid-measure changes are supported.