Let dynamic/tempo symbols auto-resize to surrounding text

Backport of musescore#9395, plus fixing an mtest
Jojo-Schmitz · Oct 8, 2021 · 9b1044d · 9b1044d
1 parent 009ddc7
commit 9b1044d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/libmscore/style.cpp b/libmscore/style.cpp
@@ -822,8 +822,7 @@ static const StyleType styleTypes[] {
       { Sid::partInstrumentFrameBgColor,    "partInstrumentFrameBgColor",   QColor(255, 255, 255, 0) },
 
       { Sid::dynamicsFontFace,              "dynamicsFontFace",             "Edwin" },
-      { Sid::dynamicsFontSize,              "dynamicsFontSize",             11.0 },
-      { Sid::dynamicsSymbolFontSize,        "dynamicsSymbolFontSize",       20.0 },
+      { Sid::dynamicsFontSize,              "dynamicsFontSize",             10.0 },
       { Sid::dynamicsLineSpacing,           "dynamicsLineSpacing",          1.0 },
       { Sid::dynamicsFontSpatiumDependent,  "dynamicsFontSpatiumDependent", true },
       { Sid::dynamicsFontStyle,             "dynamicsFontStyle",            int(FontStyle::Italic) },
@@ -854,7 +853,6 @@ static const StyleType styleTypes[] {
 
       { Sid::tempoFontFace,                 "tempoFontFace",                "Edwin" },
       { Sid::tempoFontSize,                 "tempoFontSize",                12.0 },
-      { Sid::tempoSymbolFontSize,           "tempoSymbolFontSize",          20.0 },
       { Sid::tempoLineSpacing,              "tempoLineSpacing",             1.0 },
       { Sid::tempoFontSpatiumDependent,     "tempoFontSpatiumDependent",    true },
       { Sid::tempoFontStyle,                "tempoFontStyle",               int(FontStyle::Bold) },

diff --git a/libmscore/style.h b/libmscore/style.h
@@ -807,7 +807,6 @@ enum class Sid {
 
       dynamicsFontFace,
       dynamicsFontSize,
-      dynamicsSymbolFontSize,
       dynamicsLineSpacing,
       dynamicsFontSpatiumDependent,
       dynamicsFontStyle,
@@ -838,7 +837,6 @@ enum class Sid {
 
       tempoFontFace,
       tempoFontSize,
-      tempoSymbolFontSize,
       tempoLineSpacing,
       tempoFontSpatiumDependent,
       tempoFontStyle,

diff --git a/libmscore/textbase.cpp b/libmscore/textbase.cpp
@@ -855,18 +855,22 @@ QFont TextFragment::font(const TextBase* t) const
             if (t->parent() && t->isDynamic()) {
 #if 0 // no fontByName() in 3.x?
                   family = t->score()->scoreFont()->fontByName(t->score()->styleSt(Sid::MusicalSymbolFont))->family();
+                  //family = t->score()->scoreFont()->fontByName(t->score()->styleSt(Sid::MusicalTestFont)replace(" Text", ""))->family();
 #else
                   family = t->score()->styleSt(Sid::MusicalSymbolFont);
+                  //family = t->score()->styleSt(Sid::MusicalTextFont).replace(" Text", "");
                   if (family == "Emmentaler")
                         family = "MScore";
                   else if (family == "Gonville")
                         family = "Gootville";
 #endif
-                  m = t->score()->styleV(Sid::dynamicsSymbolFontSize).toReal() * t->mag();
+                  // to keep desired size ratio (based on 20pt symbol size to 10pt text size)
+                  m *= 2;
                   }
             else if (t->parent() && t->isTempoText()) {
                   family = t->score()->styleSt(Sid::MusicalTextFont);
-                  m = t->score()->styleV(Sid::tempoSymbolFontSize).toReal();
+                  // to keep desired size ratio (based on 20pt symbol size to 12pt text size)
+                  m *= 5.0 / 3.0;
                   }
             else {
                   family = t->score()->styleSt(Sid::MusicalTextFont);

diff --git a/mtest/musicxml/io/testMeasureStyleSlash_ref.mscx b/mtest/musicxml/io/testMeasureStyleSlash_ref.mscx
@@ -25,7 +25,6 @@
       <rhGuitarFingeringFontSize>10</rhGuitarFingeringFontSize>
       <stringNumberFontSize>10</stringNumberFontSize>
       <partInstrumentFontSize>10</partInstrumentFontSize>
-      <dynamicsFontSize>10</dynamicsFontSize>
       <tempoFontSize>10</tempoFontSize>
       <metronomeFontSize>10</metronomeFontSize>
       <measureNumberFontSize>10</measureNumberFontSize>