Merge pull request #2913 from Jojo-Schmitz/dividers

fix #151456: right system dividers show left
musescore · Dec 21, 2016 · ddc0f12 · ddc0f12
2 parents 0d925fb + 686c469
commit ddc0f12
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -1480,6 +1480,15 @@ static void checkDivider(bool left, System* s, qreal sdd)
                   }
             divider->layout();
             divider->rypos() = divider->height() * .5 + sdd;
+            if (left) {
+                  divider->rypos() += s->score()->styleD(StyleIdx::dividerLeftY) * SPATIUM20;
+                  divider->rxpos() =  s->score()->styleD(StyleIdx::dividerLeftX) * SPATIUM20;
+                  }
+            else {
+                  divider->rypos() += s->score()->styleD(StyleIdx::dividerRightY) * SPATIUM20;
+                  divider->rxpos() =  s->score()->pageFormat()->printableWidth() * DPI - divider->width();
+                  divider->rxpos() += s->score()->styleD(StyleIdx::dividerRightX) * SPATIUM20;
+                  }
             divider->adjustReadPos();
             }
       else if (divider) {

diff --git a/libmscore/systemdivider.cpp b/libmscore/systemdivider.cpp
@@ -49,15 +49,10 @@ void SystemDivider::layout()
       SymId sid;
       ScoreFont* sf = score()->scoreFont();
 
-      switch (_dividerType) {
-            case SystemDivider::LEFT:
-                  sid = Sym::name2id(score()->styleSt(StyleIdx::dividerLeftSym));
-                  break;
-            case SystemDivider::RIGHT:
-            default:
-                  sid = Sym::name2id(score()->styleSt(StyleIdx::dividerRightSym));
-                  break;
-            }
+      if (_dividerType == SystemDivider::LEFT)
+            sid = Sym::name2id(score()->styleSt(StyleIdx::dividerLeftSym));
+      else
+            sid = Sym::name2id(score()->styleSt(StyleIdx::dividerRightSym));
       setSym(sid, sf);
       Symbol::layout();
       }
@@ -72,12 +67,10 @@ void SystemDivider::setDividerType(SystemDivider::Type v)
       if (v == SystemDivider::LEFT) {
             setXoff(score()->styleD(StyleIdx::dividerLeftX));
             setYoff(score()->styleD(StyleIdx::dividerLeftY));
-            setAlign(AlignmentFlags::LEFT | AlignmentFlags::VCENTER);
             }
       else {
             setXoff(score()->styleD(StyleIdx::dividerRightX));
             setYoff(score()->styleD(StyleIdx::dividerRightY));
-            setAlign(AlignmentFlags::RIGHT | AlignmentFlags::VCENTER);
             }
       }
 
@@ -111,21 +104,18 @@ void SystemDivider::write(XmlWriter& xml) const
 
 void SystemDivider::read(XmlReader& e)
       {
-      Align a = align() & AlignmentFlags::VMASK;
       ScoreFont* sf = score()->scoreFont();
       if (e.attribute("type") == "left") {
             _dividerType = SystemDivider::Type::LEFT;
             SymId sym = Sym::name2id(score()->styleSt(StyleIdx::dividerLeftSym));
             setSym(sym, sf);
-            setAlign(a | AlignmentFlags::LEFT);
             setXoff(score()->styleD(StyleIdx::dividerLeftX));
             setYoff(score()->styleD(StyleIdx::dividerLeftY));
             }
       else {
             _dividerType = SystemDivider::Type::RIGHT;
             SymId sym = Sym::name2id(score()->styleSt(StyleIdx::dividerRightSym));
             setSym(sym, sf);
-            setAlign(a | AlignmentFlags::RIGHT);
             setXoff(score()->styleD(StyleIdx::dividerRightX));
             setYoff(score()->styleD(StyleIdx::dividerRightY));
             }