Corrections

musescore · Dec 23, 2024 · fa3e9e7 · fa3e9e7
1 parent f8e067a
commit fa3e9e7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/engraving/rendering/score/slurtielayout.cpp b/src/engraving/rendering/score/slurtielayout.cpp
@@ -1100,7 +1100,7 @@ Shape SlurTieLayout::getSegmentShapes(SlurSegment* slurSeg, ChordRest* startCR,
     }
 
     for (Segment* seg = startSeg; seg && seg->tick() <= endSeg->tick(); seg = seg->next1enabled()) {
-        if (seg->isType(SegmentType::BarLineType) || seg->isBreathType()) {
+        if (seg->isType(SegmentType::BarLineType) || seg->isBreathType() || seg->hasTimeSigAboveStaves()) {
             continue;
         }
         segShapes.add(getSegmentShape(slurSeg, seg, startCR, endCR));

diff --git a/src/engraving/rendering/score/systemlayout.cpp b/src/engraving/rendering/score/systemlayout.cpp
@@ -786,27 +786,6 @@ void SystemLayout::layoutSystemElements(System* system, LayoutContext& ctx)
         }
     }
 
-    //-------------------------------------------------------------
-    // Compute autoplace for TimeSig above the staff
-    //-------------------------------------------------------------
-
-    if (system->style().styleV(Sid::timeSigPlacement).value<TimeSigPlacement>() == TimeSigPlacement::ABOVE_STAVES) {
-        for (MeasureBase* mb : system->measures()) {
-            if (!mb->isMeasure()) {
-                continue;
-            }
-            for (Segment& s : toMeasure(mb)->segments()) {
-                if (s.isType(SegmentType::TimeSig | SegmentType::TimeSigAnnounce)) {
-                    for (EngravingItem* timeSig : s.elist()) {
-                        if (timeSig && timeSig->ldata()->isValid()) {
-                            Autoplace::autoplaceSegmentElement(timeSig, timeSig->mutldata());
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     //-------------------------------------------------------------
     // layout ties and guitar bends
     //-------------------------------------------------------------
@@ -1309,6 +1288,27 @@ void SystemLayout::layoutSystemElements(System* system, LayoutContext& ctx)
             }
         }
     }
+
+    //-------------------------------------------------------------
+    // TimeSig above staff
+    //-------------------------------------------------------------
+
+    if (system->style().styleV(Sid::timeSigPlacement).value<TimeSigPlacement>() == TimeSigPlacement::ABOVE_STAVES) {
+        for (MeasureBase* mb : system->measures()) {
+            if (!mb->isMeasure()) {
+                continue;
+            }
+            for (Segment& s : toMeasure(mb)->segments()) {
+                if (s.isType(SegmentType::TimeSig | SegmentType::TimeSigAnnounce)) {
+                    for (EngravingItem* timeSig : s.elist()) {
+                        if (timeSig && timeSig->ldata()->isValid()) {
+                            Autoplace::autoplaceSegmentElement(timeSig, timeSig->mutldata());
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
 void SystemLayout::doLayoutTies(System* system, std::vector<Segment*> sl, const Fraction& stick, const Fraction& etick, LayoutContext& ctx)