Skip to content

Commit 81b5e8b

Browse files
committed
Introduced styles for pedal line texts
1 parent 31d22f2 commit 81b5e8b

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

src/engraving/libmscore/pedal.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ using namespace mu;
3333

3434
namespace mu::engraving {
3535
static const ElementStyle pedalStyle {
36+
{ Sid::pedalText, Pid::BEGIN_TEXT },
37+
{ Sid::pedalContinueText, Pid::CONTINUE_TEXT },
38+
{ Sid::pedalEndText, Pid::END_TEXT },
3639
{ Sid::pedalFontFace, Pid::BEGIN_FONT_FACE },
3740
{ Sid::pedalFontFace, Pid::CONTINUE_FONT_FACE },
3841
{ Sid::pedalFontFace, Pid::END_FONT_FACE },
@@ -92,9 +95,6 @@ Pedal::Pedal(EngravingItem* parent)
9295
{
9396
initElementStyle(&pedalStyle);
9497
setLineVisible(true);
95-
resetProperty(Pid::BEGIN_TEXT);
96-
resetProperty(Pid::CONTINUE_TEXT);
97-
resetProperty(Pid::END_TEXT);
9898

9999
resetProperty(Pid::LINE_WIDTH);
100100
resetProperty(Pid::LINE_STYLE);
@@ -137,9 +137,13 @@ engraving::PropertyValue Pedal::propertyDefault(Pid propertyId) const
137137
return style().styleV(Sid::pedalLineStyle);
138138

139139
case Pid::BEGIN_TEXT:
140+
return score()->styleV(Sid::pedalText);
141+
140142
case Pid::CONTINUE_TEXT:
143+
return score()->styleV(Sid::pedalContinueText);
144+
141145
case Pid::END_TEXT:
142-
return "";
146+
return score()->styleV(Sid::pedalEndText);
143147

144148
case Pid::BEGIN_TEXT_PLACE:
145149
case Pid::CONTINUE_TEXT_PLACE:

src/engraving/rw/write/twrite.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2128,9 +2128,6 @@ void TWrite::write(const Pedal* item, XmlWriter& xml, WriteContext& ctx)
21282128

21292129
for (auto i : {
21302130
Pid::END_HOOK_TYPE,
2131-
Pid::BEGIN_TEXT,
2132-
Pid::CONTINUE_TEXT,
2133-
Pid::END_TEXT,
21342131
Pid::LINE_VISIBLE,
21352132
Pid::BEGIN_HOOK_TYPE
21362133
}) {

src/engraving/style/styledef.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,9 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
283283
{ Sid::pedalFrameRound, "pedalFrameRound", 0 },
284284
{ Sid::pedalFrameFgColor, "pedalFrameFgColor", Color::BLACK },
285285
{ Sid::pedalFrameBgColor, "pedalFrameBgColor", Color::transparent },
286+
{ Sid::pedalText, "pedalText", String() },
287+
{ Sid::pedalContinueText, "pedalContinueText", String() },
288+
{ Sid::pedalEndText, "pedalEndText", String() },
286289

287290
{ Sid::trillPlacement, "trillPlacement", PlacementV::ABOVE },
288291
{ Sid::trillPosAbove, "trillPosAbove", PointF(.0, -0.5) },

src/engraving/style/styledef.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,9 @@ enum class Sid {
297297
pedalFrameRound,
298298
pedalFrameFgColor,
299299
pedalFrameBgColor,
300+
pedalText,
301+
pedalContinueText,
302+
pedalEndText,
300303

301304
trillPlacement,
302305
trillPosAbove,

0 commit comments

Comments
 (0)