fix #268147 Bad horizontal alignment of pedal lines

musescore · Feb 12, 2018 · acc7757 · acc7757
1 parent 902ae54
commit acc7757
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -2846,7 +2846,7 @@ static void layoutTies(Chord* ch, System* system, int stick)
 //   processLines
 //---------------------------------------------------------
 
-static void processLines(System* system, std::vector<Spanner*> lines)
+static void processLines(System* system, std::vector<Spanner*> lines, bool align)
       {
       std::vector<SpannerSegment*> segments;
       for (Spanner* sp : lines) {
@@ -2855,6 +2855,14 @@ static void processLines(System* system, std::vector<Spanner*> lines)
                   segments.push_back(ss);
             }
 
+      if (align && segments.size() > 1) {
+            qreal y = segments[0]->userOff().y();
+            for (unsigned i = 1; i < segments.size(); ++i)
+                  y = qMax(y, segments[i]->userOff().y());
+            for (auto ss : segments)
+                  ss->rUserYoffset() = y;
+            }
+
       //
       // add shapes to staff shapes
       //
@@ -3163,7 +3171,7 @@ System* Score::collectSystem(LayoutContext& lc)
                               spanner.push_back(sp);
                         }
                   }
-            processLines(system, spanner);
+            processLines(system, spanner, false);
             }
 
       std::vector<Dynamic*> dynamics;
@@ -3246,19 +3254,23 @@ System* Score::collectSystem(LayoutContext& lc)
 
             std::vector<Spanner*> ottavas;
             std::vector<Spanner*> spanner;
+            std::vector<Spanner*> pedal;
 
             for (auto interval : spanners) {
                   Spanner* sp = interval.value;
                   if (sp->tick() < etick && sp->tick2() > stick) {
                         if (sp->isOttava())
                               ottavas.push_back(sp);
+                        else if (sp->isPedal())
+                              pedal.push_back(sp);
                         else if (!sp->isSlur())             // slurs are already handled
                               spanner.push_back(sp);
                         }
                   }
 
-            processLines(system, ottavas);
-            processLines(system, spanner);
+            processLines(system, ottavas, false);
+            processLines(system, pedal, true);
+            processLines(system, spanner, false);
 
             //
             // vertical align volta segments