Fix GH#19669: Enable 2nd adjustment for cross staff beamed notes

Backport of musescore#19831
Jojo-Schmitz · Oct 26, 2023 · e8e7c53 · e8e7c53
1 parent 02224ef
commit e8e7c53
Show file tree

Hide file tree

Showing 4 changed files with 740 additions and 14 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -157,7 +157,6 @@ void Score::layoutChords1(Segment* segment, int staffIdx)
             return;
             }
 
-      bool crossBeamFound = false;
       std::vector<Note*> upStemNotes;
       std::vector<Note*> downStemNotes;
       int upVoices       = 0;
@@ -182,8 +181,6 @@ void Score::layoutChords1(Segment* segment, int staffIdx)
             Element* e = segment->element(track);
             if (e && e->isChord()) {
                   Chord* chord = toChord(e);
-                  if (chord->beam() && chord->beam()->cross())
-                        crossBeamFound = true;
                   bool hasGraceBefore = false;
                   for (Chord* c : chord->graceNotes()) {
                         if (c->isGraceBefore())
@@ -196,7 +193,7 @@ void Score::layoutChords1(Segment* segment, int staffIdx)
                         upStemNotes.insert(upStemNotes.end(), chord->notes().begin(), chord->notes().end());
                         upDots   = qMax(upDots, chord->dots());
                         maxUpMag = qMax(maxUpMag, chord->mag());
-                        if (!upHooks)
+                        if (!upHooks && !chord->beam())
                               upHooks = chord->hook();
                         if (hasGraceBefore)
                               upGrace = true;
@@ -206,7 +203,7 @@ void Score::layoutChords1(Segment* segment, int staffIdx)
                         downStemNotes.insert(downStemNotes.end(), chord->notes().begin(), chord->notes().end());
                         downDots = qMax(downDots, chord->dots());
                         maxDownMag = qMax(maxDownMag, chord->mag());
-                        if (!downHooks)
+                        if (!downHooks && !chord->beam())
                               downHooks = chord->hook();
                         if (hasGraceBefore)
                               downGrace = true;
@@ -314,13 +311,8 @@ void Score::layoutChords1(Segment* segment, int staffIdx)
             if (upVoices && downVoices) {
                   Note* bottomUpNote = upStemNotes.front();
                   Note* topDownNote  = downStemNotes.back();
-                  int separation;
-                  // TODO: handle conflicts for cross-staff notes and notes on cross-staff beams
-                  // for now we simply treat these as though there is no conflict
-                  if (bottomUpNote->chord()->staffMove() == topDownNote->chord()->staffMove() && !crossBeamFound)
-                        separation = topDownNote->line() - bottomUpNote->line();
-                  else
-                        separation = 2;   // no conflict
+                  int separation = topDownNote->line() - bottomUpNote->line();
+
                   QVector<Note*> overlapNotes;
                   overlapNotes.reserve(8);