LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3627 from mattmcclinch/113846-shadow-note

Browse source 
fix #113846: Regression—shadow note appears in note entry with keyboard or piano keyboard
This commit is contained in:
Nicolas Froment 2018-04-18 11:00:37 +02:00 committed by GitHub
commit 0603c9d393
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mscore/events.cpp
View file

@ -358,6 +358,7 @@ void ScoreView::mousePressEvent(QMouseEvent* ev)
_score->endCmd(); _score->endCmd();
if (_score->inputState().cr()) if (_score->inputState().cr())
adjustCanvasPosition(_score->inputState().cr(), false); adjustCanvasPosition(_score->inputState().cr(), false);
shadowNote->setVisible(false);
break; break;
case ViewState::EDIT: { case ViewState::EDIT: {

7
mscore/scoreview.cpp
View file

@ -1688,6 +1688,7 @@ void ScoreView::cmd(const char* s)
{ {
const QByteArray cmd(s); const QByteArray cmd(s);
shadowNote->setVisible(false);
if (MScore::debugMode) if (MScore::debugMode)
qDebug("ScoreView::cmd <%s>", s); qDebug("ScoreView::cmd <%s>", s);
@ -2916,9 +2917,8 @@ void ScoreView::adjustCanvasPosition(const Element* el, bool playBack, int staff
showRect.setHeight(r.height()); showRect.setHeight(r.height());
} }
} }
if (mscore->state() & ScoreState::STATE_NOTE_ENTRY) { if (shadowNote->visible())
setShadowNote(p); setShadowNote(p);
}
if (r.contains(showRect)) if (r.contains(showRect))
return; return;
@ -4341,7 +4341,8 @@ void ScoreView::updateContinuousPanel()
void ScoreView::updateShadowNotes() void ScoreView::updateShadowNotes()
{ {
setShadowNote(shadowNote->pos()); if (shadowNote->visible())
setShadowNote(shadowNote->pos());
} }
//--------------------------------------------------------- //---------------------------------------------------------