Skip to content

Commit 15f8b13

Browse files
committed
exclude all fermatas from rest collision shape
1 parent 9aca0a5 commit 15f8b13

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

src/engraving/rendering/score/restlayout.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -620,13 +620,10 @@ void RestLayout::checkFullMeasureRestCollisions(const System* system, LayoutCont
620620
double xSegment = segment.pagePos().x() - system->pagePos().x();
621621
measureShape.add(segment.staffShape(staffIdx).translated(PointF(xSegment, 0.0)));
622622
}
623-
measureShape.remove_if([fullMeasureRest] (const ShapeElement& shapeEl) {
623+
measureShape.remove_if([] (const ShapeElement& shapeEl) {
624624
const EngravingItem* shapeItem = shapeEl.item();
625625
return shapeItem && ((shapeItem->isRest() && toRest(shapeItem)->isFullMeasureRest())
626-
|| (shapeItem->type() == ElementType::FERMATA
627-
&& shapeItem->explicitParent() == fullMeasureRest->segment()
628-
&& shapeItem->track() == fullMeasureRest->track())
629-
|| shapeItem->isBarLine() || shapeItem->isAccidental());
626+
|| shapeItem->isBarLine() || shapeItem->isAccidental() || shapeItem->isFermata());
630627
});
631628

632629
if (measureShape.size() == 0) {

0 commit comments

Comments
 (0)