Fix GH#8944: Add right margin to system trailers

Backport of musescore#9158, different default, 0.67 rather than 1.0 though
Jojo-Schmitz · Sep 26, 2021 · ee19fbb · ee19fbb
1 parent 753efe4
commit ee19fbb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/libmscore/segment.cpp b/libmscore/segment.cpp
@@ -2154,6 +2154,8 @@ qreal Segment::minRight() const
             distance = qMax(distance, sh.right());
       if (isClefType())
             distance += score()->styleP(Sid::clefBarlineDistance);
+      if (trailer())
+          distance += score()->styleP(Sid::systemTrailerRightMargin);
       return distance;
       }
 

diff --git a/libmscore/style.cpp b/libmscore/style.cpp
@@ -189,6 +189,7 @@ static const StyleType styleTypes[] {
       { Sid::keyBarlineDistance,      "keyBarlineDistance",      Spatium(1.0) },
       { Sid::systemHeaderDistance,    "systemHeaderDistance",    Spatium(2.5) },     // gould: 2.5
       { Sid::systemHeaderTimeSigDistance, "systemHeaderTimeSigDistance", Spatium(2.0) },  // gould: 2.0
+      { Sid::systemTrailerRightMargin, "systemTrailerRightMargin", Spatium(0.63) },
 
       { Sid::clefBarlineDistance,     "clefBarlineDistance",     Spatium(0.5) },
       { Sid::timesigBarlineDistance,  "timesigBarlineDistance",  Spatium(0.5) },

diff --git a/libmscore/style.h b/libmscore/style.h
@@ -174,6 +174,7 @@ enum class Sid {
       keyBarlineDistance,
       systemHeaderDistance,
       systemHeaderTimeSigDistance,
+      systemTrailerRightMargin,
 
       clefBarlineDistance,
       timesigBarlineDistance,