ENG-53: FretDiagrams create horizontal space

This commit adds a case for including fretboard diagrams when
creating horizontal spacing in the ChordRest::shape() function. In
pursuit of this, it also extracts a calculateBoundingRect function from
FretDiagram::layout().

NOTE: In order to allow "orphaned" FretDiagrams to still create space,
the spacer is added to all staves. This is redundant in some cases, so
a more performant solution may be desirable in the future.

libmscore/chordrest.cpp

@@ -1305,12 +1305,28 @@ Shape ChordRest::shape() const
             if (e->isHarmony() && e->staffIdx() == staffIdx()) {
                   Harmony* h = toHarmony(e);
                   // calculate bbox only (do not reset position)
-                  h->layout1();
+                  if (h->bbox().isEmpty()) h->layout1();
                   const qreal margin = styleP(Sid::minHarmonyDistance) * 0.5;
                   x1 = qMin(x1, e->bbox().x() - margin + e->pos().x());
                   x2 = qMax(x2, e->bbox().x() + e->bbox().width() + margin + e->pos().x());
                   adjustWidth = true;
                   }
+            else if (e->isFretDiagram()) {
+                  FretDiagram* fd = toFretDiagram(e);
+                  if (fd->bbox().isEmpty()) fd->calculateBoundingRect();
+                  qreal margin = styleP(Sid::fretMinDistance) * 0.5;
+                  x1 = qMin(x1, e->bbox().x() - margin + e->pos().x());
+                  x2 = qMax(x2, e->bbox().x() + e->bbox().width() + margin + e->pos().x());
+                  adjustWidth = true;
+                  if (fd->harmony()) {
+                        Harmony* h = fd->harmony();
+                        if (h->bbox().isEmpty()) h->layout1();
+                        margin = styleP(Sid::minHarmonyDistance) * 0.5;
+                        x1 = qMin(x1, h->bbox().x() - margin + h->pos().x() + e->pos().x());
+                        x2 = qMax(x2, h->bbox().x() + h->bbox().width() + margin + h->pos().x() + e->pos().x());
+                        adjustWidth = true;
+                        }
+                  }
             }
       if (adjustWidth)
             shape.addHorizontalSpacing(Shape::SPACING_HARMONY, x1, x2);

libmscore/fret.cpp

@@ -452,10 +452,10 @@ void FretDiagram::draw(QPainter* painter) const
       }
 
 //---------------------------------------------------------
-//   layout
+//   calculateBoundingRect()
 //---------------------------------------------------------
 
-void FretDiagram::layout()
+void FretDiagram::calculateBoundingRect()
       {
       qreal _spatium  = spatium() * _userMag;
       stringLw        = _spatium * 0.08;
@@ -492,7 +492,15 @@ void FretDiagram::layout()
             }
 
       bbox().setRect(x, y, w, h);
+      }
 
+//---------------------------------------------------------
+//   layout
+//---------------------------------------------------------
+
+void FretDiagram::layout()
+      {
+      calculateBoundingRect();
       if (!parent() || !parent()->isSegment()) {
             setPos(QPointF());
             return;
@@ -522,7 +530,7 @@ void FretDiagram::layout()
             mainWidth = stringDist * (_strings - 1);
       else if (_orientation == Orientation::HORIZONTAL)
             mainWidth = fretDist * (_frets + 0.5);
-      setPos((noteheadWidth - mainWidth)/2, -(h + styleP(Sid::fretY)));
+      setPos((noteheadWidth - mainWidth)/2, -(bbox().height() + styleP(Sid::fretY)));
 
       autoplaceSegmentElement();
 

libmscore/fret.h

@@ -173,6 +173,7 @@ class FretDiagram final : public Element {
 
       ElementType type() const override { return ElementType::FRET_DIAGRAM; }
       void layout() override;
+      void calculateBoundingRect();
       void write(XmlWriter& xml) const override;
       void writeNew(XmlWriter& xml) const;
       void writeOld(XmlWriter& xml) const;