LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2226 from MarcSabatella/78261-repeat-drop-style

Browse source 
fix #78261: text style not honored when adding repeat via double click
This commit is contained in:
Werner Schweer 2015-10-28 10:07:58 +01:00
commit 00949255cc
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libmscore/measure.cpp
View file

@ -1315,6 +1315,7 @@ Element* Measure::drop(const DropData& data)
QPointF mrp(data.pos - pagePos()); QPointF mrp(data.pos - pagePos());
#endif #endif
Staff* staff = score()->staff(staffIdx); Staff* staff = score()->staff(staffIdx);
bool fromPalette = (e->track() == -1);
switch(e->type()) { switch(e->type()) {
case Element::Type::MEASURE_LIST: case Element::Type::MEASURE_LIST:
@ -1332,6 +1333,16 @@ qDebug("drop staffList");
case Element::Type::JUMP: case Element::Type::JUMP:
e->setParent(this); e->setParent(this);
e->setTrack(0); e->setTrack(0);
{
// code borrowed from ChordRest::drop()
Text* t = static_cast<Text*>(e);
TextStyleType st = t->textStyleType();
// for palette items, we want to use current score text style settings
// except where the source element had explicitly overridden these via text properties
// palette text style will be relative to baseStyle, so rebase this to score
if (st >= TextStyleType::DEFAULT && fromPalette)
t->textStyle().restyle(MScore::baseStyle()->textStyle(st), score()->textStyle(st));
}
score()->undoAddElement(e); score()->undoAddElement(e);
return e; return e;