Merge pull request #23895 from Nekotizimo/21572-color-beamed-chord

Fix #21572: Changing color of beamed chords should only change the elements within selection
musescore · Aug 12, 2024 · c510289 · c510289
2 parents 101db16 + 5068d57
commit c510289
Showing 1 changed file with 21 additions and 8 deletions.
diff --git a/src/inspector/internal/services/elementrepositoryservice.cpp b/src/inspector/internal/services/elementrepositoryservice.cpp
@@ -160,14 +160,6 @@ const
         }
 
         resultList << element;
-
-        if (elementType == mu::engraving::ElementType::BEAM) {
-            const mu::engraving::Beam* beam = mu::engraving::toBeam(element);
-
-            for (mu::engraving::ChordRest* chordRest : beam->elements()) {
-                resultList << chordRest;
-            }
-        }
     }
 
     return resultList;
@@ -183,6 +175,18 @@ QList<mu::engraving::EngravingItem*> ElementRepositoryService::findChords() cons
             continue;
         }
 
+        if (element->type() == mu::engraving::ElementType::BEAM) {
+            const mu::engraving::Beam* beam = mu::engraving::toBeam(element);
+
+            for (mu::engraving::ChordRest* chordRest : beam->elements()) {
+                if (!chordRest->isChord()) {
+                    continue;
+                }
+                elements << chordRest;
+            }
+            continue;
+        }
+
         mu::engraving::EngravingItem* chord = element->findAncestor(mu::engraving::ElementType::CHORD);
         if (chord) {
             elements << chord;
@@ -407,6 +411,15 @@ QList<mu::engraving::EngravingItem*> ElementRepositoryService::findRests() const
     for (mu::engraving::EngravingItem* element : m_exposedElementList) {
         if (element->isRest()) {
             resultList << element;
+        } else if (element->isBeam()) {
+            const mu::engraving::Beam* beam = mu::engraving::toBeam(element);
+
+            for (mu::engraving::ChordRest* chordRest : beam->elements()) {
+                if (!chordRest->isRest()) {
+                    continue;
+                }
+                resultList << chordRest;
+            }
         }
     }