Fixing breath placement

rism-digital · Jun 14, 2017 · afe0b3f · afe0b3f
1 parent 783313b
commit afe0b3f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
@@ -25,7 +25,7 @@ namespace vrv {
 
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 1
-#define VERSION_REVISION 0
+#define VERSION_REVISION 1
 // Adds "-dev" in the version number - should be set to false for releases
 #define VERSION_DEV false
 

diff --git a/src/floatingobject.cpp b/src/floatingobject.cpp
@@ -13,6 +13,7 @@
 
 //----------------------------------------------------------------------------
 
+#include "breath.h"
 #include "dir.h"
 #include "doc.h"
 #include "dynam.h"
@@ -110,7 +111,13 @@ FloatingPositioner::FloatingPositioner(FloatingObject *object) : BoundingBox()
     assert(object);
 
     m_object = object;
-    if (object->Is(DIR)) {
+    if (object->Is(BREATH)) {
+        Breath *breath = dynamic_cast<Breath *>(object);
+        assert(breath);
+        // breath above by default
+        m_place = breath->HasPlace() ? breath->GetPlace() : STAFFREL_above;
+    }
+    else if (object->Is(DIR)) {
         Dir *dir = dynamic_cast<Dir *>(object);
         assert(dir);
         // dir below by default