Skip to content

Commit

Permalink
fix #195146: rehearsalmark alignment. See PR #3378
Browse files Browse the repository at this point in the history
  • Loading branch information
lasconic committed Jan 11, 2018
1 parent ff7cb81 commit 4ffd8bf
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions libmscore/elementlayout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,14 @@ bool ElementLayout::readProperties(XmlReader& e)

void ElementLayout::restyle(const ElementLayout& ol, const ElementLayout& nl)
{
if ((ol._align & Align::HMASK) == (_align & Align::HMASK))
if ((ol._align & Align::HMASK) == (_align & Align::HMASK)) {
_align = Align(_align & Align::VMASK); // unset all HMASK-flags before setting new flags
_align = Align(_align | Align(int(nl._align) & int(Align::HMASK)));
if ((ol._align & Align::VMASK) == (_align & Align::VMASK))
}
if ((ol._align & Align::VMASK) == (_align & Align::VMASK)) {
_align = Align(_align & Align::HMASK); // unset all VMASK-flags before setting new flags
_align = _align | Align((int(nl._align) & int(Align::VMASK)));
}
if (ol._offset == _offset)
_offset = nl._offset;
if (_offsetType == ol._offsetType)
Expand Down

0 comments on commit 4ffd8bf

Please sign in to comment.