barline changes, part-1

musescore · Dec 28, 2016 · 337e885 · 337e885
1 parent 53d4ad2
commit 337e885
Show file tree

Hide file tree

Showing 108 changed files with 2,011 additions and 2,018 deletions.
diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
@@ -66,7 +66,7 @@ add_library (
       synthesizerstate.cpp mcursor.cpp groups.cpp mscoreview.cpp
       noteline.cpp spannermap.cpp
       bagpembell.cpp ambitus.cpp keylist.cpp scoreElement.cpp
-      shape.cpp systemdivider.cpp midimapping.cpp
+      shape.cpp systemdivider.cpp midimapping.cpp stafflines.cpp
       read114.cpp read206.cpp read300.cpp stafftypelist.cpp stafftypechange.cpp
       )
 

diff --git a/libmscore/arpeggio.cpp b/libmscore/arpeggio.cpp
@@ -124,7 +124,7 @@ void Arpeggio::layout()
       qreal y2 = _height + _userLen2;
 
       if (staff())
-            setMag(staff()->mag());
+            setMag(staff()->mag(tick()));
       switch (arpeggioType()) {
             case ArpeggioType::NORMAL: {
                   symbolLine(SymId::wiggleArpeggiatoUp, SymId::wiggleArpeggiatoUp);