fix #24631: style not propagated to parts

This commit is contained in:
Marc Sabatella 2014-02-18 00:00:57 -07:00
parent 151ce0c382
commit b3461e937c
2 changed files with 10 additions and 2 deletions

View file

@ -139,7 +139,7 @@ void MScore::init()
_defaultStyle = new MStyle();
Ms::initStyle(_defaultStyle);
_defaultStyleForParts = new MStyle(*_defaultStyle);
_defaultStyleForParts = 0;
_baseStyle = new MStyle(*_defaultStyle);
//

View file

@ -378,7 +378,15 @@ Score::Score(Score* parent)
_parentScore = parent;
init();
_style = MScore::defaultStyleForParts() ? *MScore::defaultStyleForParts() : *parent->style();
_style = *parent->style();
QSettings s;
QString partStyle = s.value("partStyle").toString();
if (!partStyle.isEmpty()) {
QFile f(partStyle);
if (f.open(QIODevice::ReadOnly))
_style.load(&f);
}
_synthesizerState = parent->_synthesizerState;
}