fix #33341

musescore · Sep 23, 2014 · df67515 · df67515 · lasconic · Sep 23, 2014
1 parent d9331b6
commit df67515
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -2313,9 +2313,8 @@ void Score::cmd(const QAction* a)
             deselectAll();
             undo(new ChangeStyleVal(this, StyleIdx::createMultiMeasureRests, val));
             }
-      else if (cmd == "add-brackets") {
+      else if (cmd == "add-brackets")
             cmdAddBracket();
-      }
       else
             qDebug("unknown cmd <%s>", qPrintable(cmd));
       }

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -2909,8 +2909,20 @@ void Score::collectMatch(void* data, Element* e)
       ElementPattern* p = static_cast<ElementPattern*>(data);
       if (p->type != int(e->type()))
             return;
-      if (p->subtypeValid && p->subtype != e->subtype())
-            return;
+
+      if (p->subtypeValid) {
+            // HACK: grace note is different from normal note
+            // TODO: this disables the ability to distinguish note heads in subtype
+
+            if (p->type == int(Element::Type::NOTE)) {
+                  if (p->subtype != static_cast<Note*>(e)->chord()->isGrace())
+                        return;
+                  }
+            else {
+                  if (p->subtype != e->subtype())
+                        return;
+                  }
+            }
       if ((p->staffStart != -1)
           && ((p->staffStart > e->staffIdx()) || (p->staffEnd <= e->staffIdx())))
             return;
@@ -2942,9 +2954,15 @@ void Score::selectSimilar(Element* e, bool sameStaff)
       Score* score = e->score();
 
       ElementPattern pattern;
-      pattern.type    = int(type);
-      pattern.subtype = 0;
-      pattern.subtypeValid = false;
+      pattern.type = int(type);
+      if (type == Element::Type::NOTE) {
+            pattern.subtype = static_cast<Note*>(e)->chord()->isGrace();
+            pattern.subtypeValid = true;
+            }
+      else {
+            pattern.subtype = 0;
+            pattern.subtypeValid = false;
+            }
       pattern.staffStart = sameStaff ? e->staffIdx() : -1;
       pattern.staffEnd = sameStaff ? e->staffIdx()+1 : -1;
       pattern.voice   = -1;

diff --git a/mscore/inspector/inspector.cpp b/mscore/inspector/inspector.cpp
@@ -130,11 +130,16 @@ void Inspector::setElements(const QList<Element*>& l)
             if (_element == 0)
                   ie = new InspectorEmpty(this);
 
-
             bool sameTypes = true;
             foreach(Element* ee, _el) {
                   if (_element->type() != ee->type())
                         sameTypes = false;
+                  else {
+                        // HACK:
+                        if (ee->type() == Element::Type::NOTE
+                           && static_cast<Note*>(ee)->chord()->isGrace() != static_cast<Note*>(_element)->chord()->isGrace())
+                              sameTypes = false;
+                        }
                   }
             if (!sameTypes)
                   ie = new InspectorGroupElement(this);