fix #65961: dotted line when dragging text

musescore · Jun 21, 2015 · 7846410 · 7846410
1 parent 37e54f6
commit 7846410
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 52 deletions.
diff --git a/libmscore/dynamic.cpp b/libmscore/dynamic.cpp
@@ -331,21 +331,6 @@ void Dynamic::reset()
       Text::reset();
       }
 
-//---------------------------------------------------------
-//   dragAnchor
-//---------------------------------------------------------
-
-QLineF Dynamic::dragAnchor() const
-      {
-      qreal xp = 0.0;
-      for (Element* e = parent(); e; e = e->parent())
-            xp += e->x();
-      qreal yp = measure()->system()->staffYpage(staffIdx());
-      QPointF p(xp, yp);
-
-      return QLineF(p, canvasPos());
-      }
-
 //---------------------------------------------------------
 //   drag
 //---------------------------------------------------------

diff --git a/libmscore/dynamic.h b/libmscore/dynamic.h
@@ -108,8 +108,6 @@ class Dynamic : public Text {
       void setDynRange(Range t) { _dynRange = t;    }
       void undoSetDynRange(Range t);
 
-      virtual QLineF dragAnchor() const override;
-
       virtual QVariant getProperty(P_ID propertyId) const override;
       virtual bool     setProperty(P_ID propertyId, const QVariant&) override;
       virtual QVariant propertyDefault(P_ID id) const override;

diff --git a/libmscore/harmony.cpp b/libmscore/harmony.cpp
@@ -1467,24 +1467,6 @@ void Harmony::textStyleChanged()
       render();
       }
 
-//---------------------------------------------------------
-//   dragAnchor
-//---------------------------------------------------------
-
-QLineF Harmony::dragAnchor() const
-      {
-      qreal xp = 0.0;
-      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());
-      else
-            yp = parent()->canvasPos().y();
-      QPointF p(xp, yp);
-      return QLineF(p, canvasPos());
-      }
-
 //---------------------------------------------------------
 //   extensionName
 //---------------------------------------------------------

diff --git a/libmscore/harmony.h b/libmscore/harmony.h
@@ -177,7 +177,6 @@ class Harmony : public Text {
       virtual void spatiumChanged(qreal oldValue, qreal newValue) override;
       virtual void localSpatiumChanged(qreal oldValue, qreal newValue) override;
       virtual void textStyleChanged() override;
-      virtual QLineF dragAnchor() const override;
       void setHarmony(const QString& s);
       virtual QPainterPath shape() const override;
       void calculateBoundingRect();

diff --git a/libmscore/instrchange.cpp b/libmscore/instrchange.cpp
@@ -126,21 +126,6 @@ bool InstrumentChange::setProperty(P_ID propertyId, const QVariant& v)
       return true;
       }
 
-//---------------------------------------------------------
-//   dragAnchor
-//---------------------------------------------------------
-
-QLineF InstrumentChange::dragAnchor() const
-      {
-      qreal xp = 0.0;
-      for (Element* e = parent(); e; e = e->parent())
-            xp += e->x();
-      qreal yp = segment()->measure()->system()->staffYpage(staffIdx());
-      QPointF p(xp, yp);
-
-      return QLineF(p, canvasPos());
-      }
-
 //---------------------------------------------------------
 //   drag
 //---------------------------------------------------------

diff --git a/libmscore/instrchange.h b/libmscore/instrchange.h
@@ -45,7 +45,6 @@ class InstrumentChange : public Text  {
 
       Segment* segment() const                { return (Segment*)parent(); }
 
-      virtual QLineF dragAnchor() const override;
       virtual QRectF drag(EditData*) override;
 
       virtual QVariant getProperty(P_ID propertyId) const override;

diff --git a/libmscore/text.cpp b/libmscore/text.cpp
@@ -2432,6 +2432,27 @@ void Text::dragTo(const QPointF& p)
       score()->end();
       }
 
+//---------------------------------------------------------
+//   dragAnchor
+//---------------------------------------------------------
+
+QLineF Text::dragAnchor() const
+      {
+      qreal xp = 0.0;
+      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());
+      else
+            yp = parent()->canvasPos().y();
+      QPointF p1(xp, yp);
+      QPointF p2 = canvasPos();
+      if (layoutToParentWidth())
+            p2 += bbox().topLeft();
+      return QLineF(p1, p2);
+      }
+
 //---------------------------------------------------------
 //   getProperty
 //---------------------------------------------------------

diff --git a/libmscore/text.h b/libmscore/text.h
@@ -308,6 +308,8 @@ class Text : public Element {
       void setAbove(bool val) {  textStyle().setYoff(val ? -2.0 : 7.0); }
       void dragTo(const QPointF&);
 
+      virtual QLineF dragAnchor() const override;
+
       QVariant getProperty(P_ID propertyId) const;
       bool setProperty(P_ID propertyId, const QVariant& v);
       virtual QVariant propertyDefault(P_ID id) const;