fix #289423: correct origin for note anchored lines

musescore · May 20, 2019 · edb15d9 · edb15d9
1 parent aa81f8d
commit edb15d9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/libmscore/line.cpp b/libmscore/line.cpp
@@ -715,17 +715,20 @@ QPointF SLine::linePos(Grip grip, System** sys) const
                   Element* e = grip == Grip::START ? startElement() : endElement();
                   if (!e)
                         return QPointF();
-                  System* s = toNote(e)->chord()->segment()->system();
+                  Note* n = toNote(e);
+                  System* s = n->chord()->segment()->system();
                   if (s == 0) {
-                        qDebug("no system: %s  start %s chord parent %s\n", name(), e->name(), toNote(e)->chord()->parent()->name());
+                        qDebug("no system: %s  start %s chord parent %s\n", name(), n->name(), n->chord()->parent()->name());
                         return QPointF();
                         }
                   *sys = s;
                   // return the position of the anchor note relative to the system
 //                  QPointF     elemPagePos = e->pagePos();                   // DEBUG
 //                  QPointF     systPagePos = s->pagePos();
 //                  qreal       staffYPage  = s->staffYpage(e->staffIdx());
-                  return e->pagePos() - s->pagePos();
+                  QPointF p = n->pagePos() - s->pagePos();
+                  p.rx() += n->width() * 0.5;
+                  return p;
                   }
 
             case Spanner::Anchor::CHORD:

diff --git a/libmscore/textline.cpp b/libmscore/textline.cpp
@@ -133,15 +133,23 @@ LineSegment* TextLine::createLineSegment()
 
 Sid TextLineSegment::getPropertyStyle(Pid pid) const
       {
-      if (pid == Pid::OFFSET)
-            return spanner()->placeAbove() ? Sid::textLinePosAbove : Sid::textLinePosBelow;
+      if (pid == Pid::OFFSET) {
+            if (spanner()->anchor() == Spanner::Anchor::NOTE)
+                  return Sid::NOSTYLE;
+            else
+                  return spanner()->placeAbove() ? Sid::textLinePosAbove : Sid::textLinePosBelow;
+            }
       return TextLineBaseSegment::getPropertyStyle(pid);
       }
 
 Sid TextLine::getPropertyStyle(Pid pid) const
       {
-      if (pid == Pid::OFFSET)
-            return placeAbove() ? Sid::textLinePosAbove : Sid::textLinePosBelow;
+      if (pid == Pid::OFFSET) {
+            if (anchor() == Spanner::Anchor::NOTE)
+                  return Sid::NOSTYLE;
+            else
+                  return placeAbove() ? Sid::textLinePosAbove : Sid::textLinePosBelow;
+            }
       return TextLineBase::getPropertyStyle(pid);
       }