Skip to content

Commit 10799bc

Browse files
committed
While at it ... make use of the now working isEven()
Backport of musescore#8033, resp. duplicate of musescore#8034. See also musescore#6021
1 parent 7eae111 commit 10799bc

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

libmscore/lyrics.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,12 @@ void Lyrics::layout()
272272
}
273273

274274
bool styleDidChange = false;
275-
if ((_no & 1) && !_even) {
275+
if (isEven() && !_even) {
276276
initTid(Tid::LYRICS_EVEN, /* preserveDifferent */ true);
277277
_even = true;
278278
styleDidChange = true;
279279
}
280-
if (!(_no & 1) && _even) {
280+
if (!isEven() && _even) {
281281
initTid(Tid::LYRICS_ODD, /* preserveDifferent */ true);
282282
_even = false;
283283
styleDidChange = true;
@@ -600,7 +600,7 @@ QVariant Lyrics::propertyDefault(Pid id) const
600600
{
601601
switch (id) {
602602
case Pid::SUB_STYLE:
603-
return int((_no & 1) ? Tid::LYRICS_EVEN : Tid::LYRICS_ODD);
603+
return int(isEven() ? Tid::LYRICS_EVEN : Tid::LYRICS_ODD);
604604
case Pid::PLACEMENT:
605605
return score()->styleV(Sid::lyricsPlacement);
606606
case Pid::SYLLABIC:

0 commit comments

Comments
 (0)