allow all fermatas to be added to rests

musescore · Jun 21, 2014 · d9f6bcf · d9f6bcf
1 parent b4066a7
commit d9f6bcf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/libmscore/articulation.h b/libmscore/articulation.h
@@ -123,6 +123,10 @@ class Articulation : public Element {
       const ArticulationInfo* articulationInfo() const { return &articulationList[int(articulationType())]; }
 
       static QString idx2name(int idx);
+      bool isFermata() { return _articulationType == ArticulationType::Fermata ||
+                                _articulationType == ArticulationType::Shortfermata ||
+                                _articulationType == ArticulationType::Longfermata ||
+                                _articulationType == ArticulationType::Verylongfermata; }
       };
 
 

diff --git a/libmscore/rest.cpp b/libmscore/rest.cpp
@@ -174,7 +174,7 @@ bool Rest::acceptDrop(MuseScoreView*, const QPointF&, Element* e) const
          || (type == ElementType::ICON && static_cast<Icon*>(e)->iconType() == IconType::BEAM32)
          || (type == ElementType::ICON && static_cast<Icon*>(e)->iconType() == IconType::BEAM64)
          || (type == ElementType::ICON && static_cast<Icon*>(e)->iconType() == IconType::AUTOBEAM)
-         || (type == ElementType::ARTICULATION && static_cast<Articulation*>(e)->articulationType() == ArticulationType::Fermata)
+         || (type == ElementType::ARTICULATION && static_cast<Articulation*>(e)->isFermata())
          || (type == ElementType::CLEF)
          || (type == ElementType::STAFF_TEXT)
          || (type == ElementType::BAR_LINE)
@@ -208,7 +208,7 @@ Element* Rest::drop(const DropData& data)
             case ElementType::ARTICULATION:
                   {
                   Articulation* a = static_cast<Articulation*>(e);
-                  if (a->articulationType() != ArticulationType::Fermata
+                  if (!a->isFermata()
                      || !score()->addArticulation(this, a)) {
                         delete e;
                         e = 0;