Merge pull request #129 from elerouxx/feathered_beams

fix #18548: Feathered Beam broken
musescore · Nov 21, 2012 · 681a991 · 681a991
2 parents 37f118a + ff0be47
commit 681a991
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/libmscore/beam.cpp b/libmscore/beam.cpp
@@ -1788,9 +1788,11 @@ void Beam::layout2(QList<ChordRest*>crl, SpannerSegmentType, int frag)
                                     x2 += stemWidth;
                               x3 = x2 + len;
                               }
+                        //feathered beams
                         qreal yo   = py1 + bl * _beamDist * _grow1;
+                        qreal yoo = py1 + bl * _beamDist * _grow2;
                         qreal ly1  = (x2 - x1) * slope + yo;
-                        qreal ly2  = (x3 - x1) * slope + yo;
+                        qreal ly2  = (x3 - x1) * slope + yoo;
                         if (!qIsFinite(x2) || !qIsFinite(ly1)
                            || !qIsFinite(x3) || !qIsFinite(ly2)) {
                               qDebug("bad beam segment: slope %f", slope);

diff --git a/mscore/inspector_beam.ui b/mscore/inspector_beam.ui
@@ -187,6 +187,9 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="singleStep">
+        <double>0.250000000000000</double>
+       </property>
        <property name="value">
         <double>1.000000000000000</double>
        </property>
@@ -200,6 +203,9 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="singleStep">
+        <double>0.250000000000000</double>
+       </property>
        <property name="value">
         <double>1.000000000000000</double>
        </property>