Merge pull request #4858 from MarcSabatella/286530-scale-dot

fix #286530: scaling of dot, lines, and more in parts
musescore · Apr 10, 2019 · 9fb5da2 · 9fb5da2
2 parents b2fb29a + b8d0338
commit 9fb5da2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/libmscore/excerpt.cpp b/libmscore/excerpt.cpp
@@ -215,7 +215,7 @@ void Excerpt::createExcerpt(Excerpt* excerpt)
             score->setMetaTag("partName", partLabel);
             }
 
-      // layout score
+      // initial layout of score
       score->addLayoutFlags(LayoutFlag::FIX_PITCH_VELO);
       score->doLayout();
 
@@ -272,7 +272,13 @@ void Excerpt::createExcerpt(Excerpt* excerpt)
                   }
             }
 
-      // layout score
+      // update style values if spatium different for part
+      if (oscore->spatium() != score->spatium()) {
+            //score->spatiumChanged(oscore->spatium(), score->spatium());
+            score->styleChanged();
+            }
+
+      // second layout of score
       score->setPlaylistDirty();
       oscore->rebuildMidiMapping();
       oscore->updateChannel();

diff --git a/libmscore/note.cpp b/libmscore/note.cpp
@@ -2737,6 +2737,8 @@ void Note::setScore(Score* s)
             _tieFor->setScore(s);
       if (_accidental)
             _accidental->setScore(s);
+      for (NoteDot* dot : _dots)
+            dot->setScore(s);
       for (Element* el : _el)
             el->setScore(s);
       }

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -300,6 +300,8 @@ Score::Score(MasterScore* parent, bool forcePartStyle /* = true */)
                   style().set(Sid::dividerRight, false);
                   }
             }
+      // update style values
+      _style.precomputeValues();
       _synthesizerState = parent->_synthesizerState;
       _mscVersion = parent->_mscVersion;
       }