Skip to content

Commit 2bccead

Browse files
committed
exclude all fermatas from rest collision shape
1 parent c0a2afa commit 2bccead

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
@@ -619,13 +619,10 @@ void RestLayout::checkFullMeasureRestCollisions(const System* system, LayoutCont
619619
double xSegment = segment.pagePos().x() - system->pagePos().x();
620620
measureShape.add(segment.staffShape(staffIdx).translated(PointF(xSegment, 0.0)));
621621
}
622-
measureShape.remove_if([fullMeasureRest] (const ShapeElement& shapeEl) {
622+
measureShape.remove_if([] (const ShapeElement& shapeEl) {
623623
const EngravingItem* shapeItem = shapeEl.item();
624624
return shapeItem && ((shapeItem->isRest() && toRest(shapeItem)->isFullMeasureRest())
625-
|| (shapeItem->type() == ElementType::FERMATA
626-
&& shapeItem->explicitParent() == fullMeasureRest->segment()
627-
&& shapeItem->track() == fullMeasureRest->track())
628-
|| shapeItem->isBarLine() || shapeItem->isAccidental());
625+
|| shapeItem->isBarLine() || shapeItem->isAccidental() || shapeItem->isFermata());
629626
});
630627

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

0 commit comments

Comments
 (0)