fix #93126: Dotted line to anchor when dragging element points off pa…

…ge when in vertical orientation on page >1
musescore · Jan 23, 2016 · 8df88b7 · 8df88b7
1 parent 94a0025
commit 8df88b7
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/libmscore/fret.cpp b/libmscore/fret.cpp
@@ -110,12 +110,14 @@ QLineF FretDiagram::dragAnchor() const
       for (Element* e = parent(); e; e = e->parent())
             xp += e->x();
       qreal yp;
-      if (parent()->type() == Element::Type::SEGMENT)
-            yp = static_cast<Segment*>(parent())->measure()->system()->staffYpage(staffIdx());
+      if (parent()->type() == Element::Type::SEGMENT) {
+            System* system = static_cast<Segment*>(parent())->measure()->system();
+            yp = system->staffCanvasYpage(staffIdx());
+            }
       else
             yp = parent()->canvasPos().y();
       QPointF p1(xp, yp);
-      return QLineF(p1, abbox().topLeft());
+      return QLineF(p1, canvasPos());
 #if 0 // TODOxx
       if (parent()->type() == Element::Type::SEGMENT) {
             Segment* s     = static_cast<Segment*>(parent());

diff --git a/libmscore/line.cpp b/libmscore/line.cpp
@@ -496,7 +496,7 @@ QLineF LineSegment::dragAnchor() const
             return QLineF();
       System* s;
       QPointF p = line()->linePos(Grip::START, &s);
-      p += QPointF(s->canvasPos().x(), s->staffYpage(line()->staffIdx()));
+      p += QPointF(s->canvasPos().x(), s->staffCanvasYpage(line()->staffIdx()));
 
       return QLineF(p, canvasPos());
       }

diff --git a/libmscore/symbol.cpp b/libmscore/symbol.cpp
@@ -154,7 +154,7 @@ QLineF BSymbol::dragAnchor() const
       {
       if (parent() && parent()->type() == Element::Type::SEGMENT) {
             System* system = segment()->measure()->system();
-            qreal y        = system->staff(staffIdx())->y() + system->y();
+            qreal y        = system->staffCanvasYpage(staffIdx());
 //            QPointF anchor(segment()->pageX(), y);
             QPointF anchor(segment()->canvasPos().x(), y);
             return QLineF(canvasPos(), anchor);

diff --git a/libmscore/system.cpp b/libmscore/system.cpp
@@ -1119,6 +1119,16 @@ qreal System::staffYpage(int staffIdx) const
       return _staves[staffIdx]->y() + y(); // pagePos().y();
       }
 
+//---------------------------------------------------------
+//   staffCanvasYpage
+//    return canvas coordinates
+//---------------------------------------------------------
+
+qreal System::staffCanvasYpage(int staffIdx) const
+      {
+      return _staves[staffIdx]->y() + y() + page()->canvasPos().y();
+      }
+
 //---------------------------------------------------------
 //   write
 //---------------------------------------------------------

diff --git a/libmscore/system.h b/libmscore/system.h
@@ -128,6 +128,7 @@ class System : public Element {
       QList<SysStaff*>* staves()             { return &_staves;   }
       const QList<SysStaff*>* staves() const { return &_staves;   }
       qreal staffYpage(int staffIdx) const;
+      qreal staffCanvasYpage(int staffIdx) const;
 #ifdef NDEBUG
       SysStaff* staff(int staffIdx) const    { return _staves[staffIdx]; }
 #else

diff --git a/libmscore/text.cpp b/libmscore/text.cpp
@@ -2442,8 +2442,10 @@ QLineF Text::dragAnchor() const
       for (Element* e = parent(); e; e = e->parent())
             xp += e->x();
       qreal yp;
-      if (parent()->type() == Element::Type::SEGMENT)
-            yp = static_cast<Segment*>(parent())->measure()->system()->staffYpage(staffIdx());
+      if (parent()->type() == Element::Type::SEGMENT) {
+            System* system = static_cast<Segment*>(parent())->measure()->system();
+            yp = system->staffCanvasYpage(staffIdx());
+            }
       else
             yp = parent()->canvasPos().y();
       QPointF p1(xp, yp);