Introduced styles for pedal line texts

musescore · Mar 20, 2023 · e1a60b2 · e1a60b2
1 parent fa2364e
commit e1a60b2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/engraving/libmscore/pedal.cpp b/src/engraving/libmscore/pedal.cpp
@@ -33,6 +33,9 @@ using namespace mu;
 
 namespace mu::engraving {
 static const ElementStyle pedalStyle {
+    { Sid::pedalText,                          Pid::BEGIN_TEXT },
+    { Sid::pedalContinueText,                  Pid::CONTINUE_TEXT },
+    { Sid::pedalEndText,                       Pid::END_TEXT },
     { Sid::pedalFontFace,                      Pid::BEGIN_FONT_FACE },
     { Sid::pedalFontFace,                      Pid::CONTINUE_FONT_FACE },
     { Sid::pedalFontFace,                      Pid::END_FONT_FACE },
@@ -105,9 +108,6 @@ Pedal::Pedal(EngravingItem* parent)
 {
     initElementStyle(&pedalStyle);
     setLineVisible(true);
-    resetProperty(Pid::BEGIN_TEXT);
-    resetProperty(Pid::CONTINUE_TEXT);
-    resetProperty(Pid::END_TEXT);
 
     resetProperty(Pid::LINE_WIDTH);
     resetProperty(Pid::LINE_STYLE);
@@ -150,9 +150,6 @@ void Pedal::write(XmlWriter& xml) const
 
     for (auto i : {
             Pid::END_HOOK_TYPE,
-            Pid::BEGIN_TEXT,
-            Pid::CONTINUE_TEXT,
-            Pid::END_TEXT,
             Pid::LINE_VISIBLE,
             Pid::BEGIN_HOOK_TYPE
         }) {
@@ -197,9 +194,13 @@ engraving::PropertyValue Pedal::propertyDefault(Pid propertyId) const
         return score()->styleV(Sid::pedalLineStyle);
 
     case Pid::BEGIN_TEXT:
+        return score()->styleV(Sid::pedalText);
+
     case Pid::CONTINUE_TEXT:
+        return score()->styleV(Sid::pedalContinueText);
+
     case Pid::END_TEXT:
-        return "";
+        return score()->styleV(Sid::pedalEndText);
 
     case Pid::BEGIN_TEXT_PLACE:
     case Pid::CONTINUE_TEXT_PLACE:

diff --git a/src/engraving/style/styledef.cpp b/src/engraving/style/styledef.cpp
@@ -282,6 +282,9 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
     { Sid::pedalFrameRound,         "pedalFrameRound",         0 },
     { Sid::pedalFrameFgColor,       "pedalFrameFgColor",       Color::BLACK },
     { Sid::pedalFrameBgColor,       "pedalFrameBgColor",       Color::transparent },
+    { Sid::pedalText,               "pedalText",               String() },
+    { Sid::pedalContinueText,       "pedalContinueText",       String() },
+    { Sid::pedalEndText,            "pedalEndText",            String() },
 
     { Sid::trillPlacement,          "trillPlacement",          PlacementV::ABOVE },
     { Sid::trillPosAbove,           "trillPosAbove",           PointF(.0, -0.5) },

diff --git a/src/engraving/style/styledef.h b/src/engraving/style/styledef.h
@@ -297,6 +297,9 @@ enum class Sid {
     pedalFrameRound,
     pedalFrameFgColor,
     pedalFrameBgColor,
+    pedalText,
+    pedalContinueText,
+    pedalEndText,
 
     trillPlacement,
     trillPosAbove,