While at it ... make use of the now working isEven()

Backport of musescore#8033, resp. duplicate of musescore#8034. See also musescore#6021
Jojo-Schmitz · Aug 13, 2021 · b3fdbfe · b3fdbfe
1 parent 0612250
commit b3fdbfe
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/libmscore/lyrics.cpp b/libmscore/lyrics.cpp
@@ -272,12 +272,12 @@ void Lyrics::layout()
             }
 
       bool styleDidChange = false;
-      if ((_no & 1) && !_even) {
+      if (isEven() && !_even) {
             initTid(Tid::LYRICS_EVEN, /* preserveDifferent */ true);
             _even             = true;
             styleDidChange    = true;
             }
-      if (!(_no & 1) && _even) {
+      if (!isEven() && _even) {
             initTid(Tid::LYRICS_ODD, /* preserveDifferent */ true);
             _even             = false;
             styleDidChange    = true;
@@ -600,7 +600,7 @@ QVariant Lyrics::propertyDefault(Pid id) const
       {
       switch (id) {
             case Pid::SUB_STYLE:
-                  return int((_no & 1) ? Tid::LYRICS_EVEN : Tid::LYRICS_ODD);
+                  return int(isEven() ? Tid::LYRICS_EVEN : Tid::LYRICS_ODD);
             case Pid::PLACEMENT:
                   return score()->styleV(Sid::lyricsPlacement);
             case Pid::SYLLABIC: