Merge pull request #30771 from mike-spa/fixMeasureNumberCollidesWithBracket

mike-spa · web-flow · commit a400b63280c0 · 2025-10-30T09:58:46.000+01:00
Fix measure number collides with bracket
diff --git a/src/engraving/rendering/score/measurenumberlayout.cpp b/src/engraving/rendering/score/measurenumberlayout.cpp
@@ -136,7 +136,9 @@ void MeasureNumberLayout::layoutMeasureNumberBase(MeasureNumberBase* item, Measu
         double yoff = 0.0;
 
         // If there is only one line, the barline spans outside the staff lines, so the default position is not correct.
-        if (item->staff()->constStaffType(item->measure()->tick())->lines() == 1) {
+        staff_idx_t effectiveStaffIdx = item->effectiveStaffIdx();
+        Staff* staff = item->score()->staff(effectiveStaffIdx);
+        if (staff && staff->lines(item->tick()) == 1) {
             yoff -= 2.0 * item->spatium();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,9 @@ void MeasureNumberLayout::layoutMeasureNumberBase(MeasureNumberBase* item, Measu`
`136`	`136`	`double yoff = 0.0;`
`137`	`137`
`138`	`138`	`// If there is only one line, the barline spans outside the staff lines, so the default position is not correct.`
`139`		`- if (item->staff()->constStaffType(item->measure()->tick())->lines() == 1) {`
	`139`	`+ staff_idx_t effectiveStaffIdx = item->effectiveStaffIdx();`
	`140`	`+ Staff* staff = item->score()->staff(effectiveStaffIdx);`
	`141`	`+ if (staff && staff->lines(item->tick()) == 1) {`
`140`	`142`	`yoff -= 2.0 * item->spatium();`
`141`	`143`	`}`
`142`	`144`