Fix #275099: panning screen with mouse drops selection

musescore · Aug 19, 2018 · d057948 · d057948
1 parent c27d0e6
commit d057948
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/mscore/events.cpp b/mscore/events.cpp
@@ -26,6 +26,7 @@
 #include "libmscore/chord.h"
 #include "libmscore/shadownote.h"
 #include "libmscore/repeatlist.h"
+#include "libmscore/select.h"
 
 namespace Ms {
 
@@ -248,6 +249,10 @@ void ScoreView::mouseReleaseEvent(QMouseEvent*)
                   changeState(ViewState::FOTO);
                   break;
             case ViewState::NORMAL:
+                  if (editData.startMove == editData.pos && clickOffElement) {
+                        _score->deselectAll();
+                        _score->update();
+                        }
             case ViewState::EDIT:
             case ViewState::NOTE_ENTRY:
             case ViewState::PLAY:
@@ -306,6 +311,7 @@ void ScoreView::mousePressEventNormal(QMouseEvent* ev)
                   _score = e->score();
                   _score->setUpdateAll();
                   }
+            clickOffElement = false;
             }
       else {
             // special case: chacke if measure is selected
@@ -314,9 +320,10 @@ void ScoreView::mousePressEventNormal(QMouseEvent* ev)
             if (m && m->staffLines(staffIdx)->canvasBoundingRect().contains(editData.startMove)) {
                   _score->select(m, st, staffIdx);
                   _score->setUpdateAll();
+                  clickOffElement = false;
                   }
             else if (st != SelectType::ADD)
-                  _score->deselectAll();
+                  clickOffElement = true;
             }
       _score->update();
       mscore->endCmd();

diff --git a/mscore/scoreview.h b/mscore/scoreview.h
@@ -397,6 +397,8 @@ class ScoreView : public QWidget, public MuseScoreView {
       void changeState(ViewState);
 
       virtual const QRect geometry() const override { return QWidget::geometry(); }
+
+      bool clickOffElement;
       };
 
 } // namespace Ms