Fix pasting ties #8848
Fix pasting ties #8848
Conversation
| SlurTie* sl = tie(); | ||
|
|
||
| if (ed.key == Qt::Key_X) { | ||
| if (ed.key == Qt::Key_X && !ed.modifiers) { |
There was a problem hiding this comment.
TBH I don't like this, I'd rather this be in response to the "flip placement" command which is normally mapped to "X", but this is a minimal fix.
Note that MU3 allows using, e.g. CTRL+ALT+X to flip a slur if CTRL+ALT+X isn't mapped to another command, but this isn't really expected/documented behaviour.
|
It contains multiple commits that don't belong here. Also fails the vtests? |
| return true; | ||
| } | ||
| return type != ElementType::SLUR && e->isSpanner(); | ||
| return type != ElementType::SLUR && type != ElementType::TIE && e->isSpanner(); |
There was a problem hiding this comment.
This is the same as my #8818, except for a comment:
// prevent 'hanging' slurs, avoid crash on tie
which I'd rather see here too.
There was a problem hiding this comment.
It contains multiple commits that don't belong here. Also fails the vtests?
Something's really odd with one of my local repos, that happens quite a lot.
The vtests is something random, and there's no obvious way to re-run (other than pushing more commits)
There was a problem hiding this comment.
Your PR has been merged
There was a problem hiding this comment.
But this diff doesn't show it...
There was a problem hiding this comment.
Something's really odd with one of my local repos, that happens quite a lot.
May need to clean your repo, git gc or some such?
Or you're not basing your PRs off of the latest master?
The vtests is something random, and there's no obvious way to re-run (other than pushing more commits)
git commit --amend; git push -f is what I use in such cases.
(taken from musescore#8848, which has some git issues)
wizofaus
force-pushed
the
fix-pasting-ties
branch
5 times, most recently
from
fb59a4d to
4e7daef
Compare
wizofaus
force-pushed
the
fix-pasting-ties
branch
from
4e7daef to
9e96282
Compare
wizofaus
force-pushed
the
fix-pasting-ties
branch
from
9e96282 to
a10abf3
Compare
|
Very odd, somehow all these changes already got merged... |
|
Not odd at all, I added them to my PR ;-) |
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
| n->setTieBack(this->tieBack()); | ||
| n->tieBack()->setEndNote(n); | ||
| this->setTieBack(nullptr); | ||
| } |
There was a problem hiding this comment.
I'm confused now, is that the chage you really wanted?
If so: this has not been part of my (meanwhile merged) PR
It is however part of your #8825, and as such in the current code base. Should it get removed again, or is this just another tell-tale sign of a botched local repo?
(taken from musescore#8848, which has some git issues)
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
as taken from musescore#8848, which has some git issues, and backport of musescore#8818, part 2
3 participants
Resolves: #8847
Some of my previous improvements had broken pasting ties and cutting via Ctrl+X