From 85cd42e370a4d0e144d6681e82edf62aa442dc28 Mon Sep 17 00:00:00 2001 From: Matt McClinch Date: Thu, 12 Apr 2018 23:04:04 -0400 Subject: [PATCH] =?UTF-8?q?fix=20#113846:=20Regression=E2=80=94shadow=20no?= =?UTF-8?q?te=20appears=20in=20note=20entry=20with=20keyboard=20or=20piano?= =?UTF-8?q?=20keyboard=20fix=20#271147:=20Running=20playback=20from=20note?= =?UTF-8?q?=20input=20mode=20leaves=20phantom=20note=20in=20the=20score?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mscore/events.cpp | 1 + mscore/scoreview.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mscore/events.cpp b/mscore/events.cpp index 137646ff9e..4cf62fe07b 100644 --- a/mscore/events.cpp +++ b/mscore/events.cpp @@ -358,6 +358,7 @@ void ScoreView::mousePressEvent(QMouseEvent* ev) _score->endCmd(); if (_score->inputState().cr()) adjustCanvasPosition(_score->inputState().cr(), false); + shadowNote->setVisible(false); break; case ViewState::EDIT: { diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp index babe754c67..44c862717c 100644 --- a/mscore/scoreview.cpp +++ b/mscore/scoreview.cpp @@ -1688,6 +1688,7 @@ void ScoreView::cmd(const char* s) { const QByteArray cmd(s); + shadowNote->setVisible(false); if (MScore::debugMode) qDebug("ScoreView::cmd <%s>", s); @@ -2916,9 +2917,8 @@ void ScoreView::adjustCanvasPosition(const Element* el, bool playBack, int staff showRect.setHeight(r.height()); } } - if (mscore->state() & ScoreState::STATE_NOTE_ENTRY) { + if (shadowNote->visible()) setShadowNote(p); - } if (r.contains(showRect)) return; @@ -4326,7 +4326,8 @@ void ScoreView::updateContinuousPanel() void ScoreView::updateShadowNotes() { - setShadowNote(shadowNote->pos()); + if (shadowNote->visible()) + setShadowNote(shadowNote->pos()); } //---------------------------------------------------------