Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Regression from #605 and also allow for [prev measure/system] in… #666

Open
wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

Fix: Regression from #605 and also allow for [prev measure/system] in… #666

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions libmscore/cmd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2370,8 +2370,8 @@ Element* Score::move(const QString& cmd)
cr = selection().cr();
if (cr && (cr->isGrace() || cmd == "next-chord" || cmd == "prev-chord"))
;
else
cr = inputState().cr();
else cr = inputState().cr() ? inputState().cr() : cr;

}
else if (selection().activeCR())
cr = selection().activeCR();
Expand Down Expand Up @@ -2512,8 +2512,9 @@ Element* Score::move(const QString& cmd)
// selection "cursor"
// find previous chordrest, which might be a grace note
// this may override note input cursor
el = noteEntryPos ? el : prevChordRest(cr);

if (auto pcr = prevChordRest(cr)) {
el = (noteEntryPos && !pcr->isGrace()) ? el : pcr;
}
// Skip gap rests if we're not in note entry mode...
while (!noteEntryMode() && el && el->isRest() && toRest(el)->isGap())
el = prevChordRest(toChordRest(el));
Expand Down
Loading