fix #31006: Creation of Part - header formatting could be improved

musescore · Aug 27, 2014 · 48a8430 · 48a8430
1 parent 98653d1
commit 48a8430
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/libmscore/box.cpp b/libmscore/box.cpp
@@ -386,6 +386,24 @@ QVariant Box::propertyDefault(P_ID id) const
             }
       }
 
+//---------------------------------------------------------
+//   copyValues
+//---------------------------------------------------------
+
+void Box::copyValues(Box* origin)
+      {
+      _boxHeight = origin->boxHeight();
+      _boxWidth = origin->boxWidth();
+
+      qreal factor = magS() / origin->magS();
+      _bottomGap = origin->bottomGap() * factor;
+      _topGap = origin->topGap() * factor;
+      _bottomMargin = origin->bottomMargin() * factor;
+      _topMargin = origin->topMargin() * factor;
+      _leftMargin = origin->leftMargin() * factor;
+      _rightMargin = origin->rightMargin() * factor;
+      }
+
 //---------------------------------------------------------
 //   HBox
 //---------------------------------------------------------

diff --git a/libmscore/box.h b/libmscore/box.h
@@ -79,6 +79,7 @@ class Box : public MeasureBase {
       void setTopGap(qreal val)       { _topGap = val;        }
       qreal bottomGap() const         { return _bottomGap;    }
       void setBottomGap(qreal val)    { _bottomGap = val;     }
+      void copyValues(Box* origin);
 
       virtual QVariant getProperty(P_ID propertyId) const override;
       virtual bool setProperty(P_ID propertyId, const QVariant&) override;

diff --git a/libmscore/excerpt.cpp b/libmscore/excerpt.cpp
@@ -140,10 +140,15 @@ void createExcerpt(Score* score, const QList<Part*>& parts)
 
       // create title frame for all scores if not already there
       if (!measure || (measure->type() != Element::Type::VBOX))
-            oscore->insertMeasure(Element::Type::VBOX, measure);
+            measure = oscore->insertMeasure(Element::Type::VBOX, measure);
 
+      VBox* titleFrameScore = static_cast<VBox*>(measure);
       measure = score->first();
+
       Q_ASSERT(measure->type() == Element::Type::VBOX);
+
+      VBox* titleFramePart = static_cast<VBox*>(measure);
+      titleFramePart->copyValues(titleFrameScore);
       QString partLabel = parts.front()->longName();
       if (!partLabel.isEmpty()) {
             Text* txt = new Text(score);