Merge pull request #19552 from miiizen/19489-fermata-rest

Centre fermatas over rests on resized staves
musescore · Sep 29, 2023 · 5791ea7 · 5791ea7
2 parents b005132 + 34be935
commit 5791ea7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/src/engraving/dom/rest.cpp b/src/engraving/dom/rest.cpp
@@ -697,6 +697,13 @@ double Rest::rightEdge() const
     return x() + width();
 }
 
+double Rest::centerX() const
+{
+    SymId sym = layoutData()->sym();
+    RectF bbox = symBbox(sym);
+    return bbox.left() + bbox.width() / 2;
+}
+
 //---------------------------------------------------------
 //   accent
 //---------------------------------------------------------

diff --git a/src/engraving/dom/rest.h b/src/engraving/dom/rest.h
@@ -115,6 +115,7 @@ class Rest : public ChordRest
     double stemPosX() const override;
     mu::PointF stemPosBeam() const override;
     double rightEdge() const override;
+    double centerX() const;
 
     void localSpatiumChanged(double oldValue, double newValue) override;
     PropertyValue propertyDefault(Pid) const override;

diff --git a/src/engraving/rendering/dev/tlayout.cpp b/src/engraving/rendering/dev/tlayout.cpp
@@ -1933,6 +1933,10 @@ void TLayout::layout(const Fermata* item, Fermata::LayoutData* ldata, const Layo
             const Chord* chord = toChord(e);
             x = chord->x() + chord->centerX();
             y = chord->y();
+        } else if (e->isRest()) {
+            const Rest* rest = toRest(e);
+            x = rest->x() + rest->centerX();
+            y = rest->y();
         } else {
             x = e->x() - e->shape().left() + e->width() * item->staff()->staffMag(Fraction(0, 1)) * .5;
             y = e->y();

diff --git a/vtest/scores/fermata-4.mscz b/vtest/scores/fermata-4.mscz