Fix flip then undo on drum staff

musescore · Feb 19, 2025 · 06ad4b5 · 06ad4b5
1 parent dec1cc5
commit 06ad4b5
Show file tree

Hide file tree

Showing 6 changed files with 427 additions and 16 deletions.
diff --git a/src/engraving/rendering/score/beamlayout.cpp b/src/engraving/rendering/score/beamlayout.cpp
@@ -27,6 +27,8 @@
 #include "containers.h"
 
 #include "dom/beam.h"
+#include "dom/drumset.h"
+#include "dom/part.h"
 #include "dom/tremolotwochord.h"
 #include "dom/tremolosinglechord.h"
 #include "dom/chord.h"
@@ -154,7 +156,7 @@ void BeamLayout::layout1(Beam* item, LayoutContext& ctx)
         return;
     }
 
-    if (item->staff()->isDrumStaff(Fraction(0, 1))) {
+    if (item->staff()->isDrumStaff(item->tick())) {
         if (item->direction() != DirectionV::AUTO) {
             item->setUp(item->direction() == DirectionV::UP);
         } else if (item->isGrace()) {
@@ -165,15 +167,22 @@ void BeamLayout::layout1(Beam* item, LayoutContext& ctx)
             bool firstUp = false;
             bool firstChord = true;
             for (ChordRest* cr : item->elements()) {
-                if (cr->isChord()) {
-                    DirectionV crDirection = toChord(cr)->stemDirection();
-                    if (crDirection != DirectionV::AUTO) {
-                        item->setUp(crDirection == DirectionV::UP);
-                        break;
-                    } else if (firstChord) {
-                        firstUp = cr->up();
-                        firstChord = false;
-                    }
+                if (!cr->isChord()) {
+                    item->setUp(firstUp);
+                    continue;
+                }
+                Chord* chord = toChord(cr);
+                DirectionV crDirection = toChord(cr)->stemDirection();
+                if (crDirection != DirectionV::AUTO) {
+                    item->setUp(crDirection == DirectionV::UP);
+                    break;
+                }
+                if (firstChord) {
+                    const Staff* staff = item->staff();
+                    const Part* part = staff ? staff->part() : nullptr;
+                    const Drumset* ds = part ? part->instrument(item->tick())->drumset() : nullptr;
+                    firstUp = ds ? ds->stemDirection(chord->upNote()->pitch()) == DirectionV::UP : chord->up();
+                    firstChord = false;
                 }
                 item->setUp(firstUp);
             }