fix harmony layout

Author: wschweer

libmscore/harmony.cpp

@@ -536,28 +536,23 @@ void Harmony::layout()
             Text::layout1();
       else {
             // textStyle().layout(this);
-            if (!parent()) {
-                  setPos(QPointF(0.0, 0.0));
-                  return;
-                  }
-
             QRectF bb;
             foreach(const TextSegment* ts, textList)
                   bb |= ts->boundingRect().translated(ts->x, ts->y);
             setbbox(bb);
             }
-      if (parent() == 0) {          // for use in palette
+      if (!parent()) {          // for use in palette
             setPos(QPointF());
             return;
             }
 
-      qreal yy;
+      qreal yy = 0.0;
       if (parent()->type() == SEGMENT) {
             Measure* m = static_cast<Measure*>(parent()->parent());
             yy = track() < 0 ? 0.0 : m->system()->staff(staffIdx())->y();
-            yy -= (bbox().height() + score()->styleP(ST_harmonyY));
+            yy += score()->styleP(ST_harmonyY);
             }
-      else {
+      else if (parent()->type() == FRET_DIAGRAM) {
             yy = score()->styleP(ST_harmonyFretDist);
             }
       setPos(QPointF(0.0, yy));

libmscore/style.cpp

@@ -484,7 +484,7 @@ StyleData::StyleData()
 
             StyleVal(ST_pedalY,   Spatium(8)),
             StyleVal(ST_trillY,   Spatium(-1)),
-            StyleVal(ST_harmonyY, Spatium(-4)),
+            StyleVal(ST_harmonyY, Spatium(-2.5)),
             StyleVal(ST_harmonyFretDist, Spatium(-1.5)),
 
             StyleVal(ST_showPageNumber, true),

mscore/editstyle.ui

@@ -3607,7 +3607,7 @@ p, li { white-space: pre-wrap; }
              <double>10000.000000000000000</double>
             </property>
             <property name="singleStep">
-             <double>1.500000000000000</double>
+             <double>0.500000000000000</double>
             </property>
             <property name="value">
              <double>-4.000000000000000</double>