Avoiding control events to remain in the space between the staff and …

…a layer element
rism-digital · Jun 14, 2017 · a8b56bd · a8b56bd
1 parent afe0b3f
commit a8b56bd
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/src/floatingobject.cpp b/src/floatingobject.cpp
@@ -327,8 +327,14 @@ bool FloatingPositioner::CalcDrawingYRel(Doc *doc, StaffAlignment *staffAlignmen
                 }
                 return true;
             }
-            if (this->VerticalContentOverlap(horizOverlapingBBox, margin)) {
-                yRel = -staffAlignment->CalcOverflowAbove(horizOverlapingBBox) + GetContentY1() - margin;
+            yRel = -staffAlignment->CalcOverflowAbove(horizOverlapingBBox) + GetContentY1() - margin;
+            Object *object = dynamic_cast<Object*>(horizOverlapingBBox);
+            // With LayerElement always move them up
+            if (object && object->IsLayerElement()) {
+                if (yRel < 0) this->SetDrawingYRel(yRel);
+            }
+            // Otherwise only if the is a vertical overlap
+            else if (this->VerticalContentOverlap(horizOverlapingBBox, margin)) {
                 this->SetDrawingYRel(yRel);
             }
         }
@@ -341,9 +347,15 @@ bool FloatingPositioner::CalcDrawingYRel(Doc *doc, StaffAlignment *staffAlignmen
                 }
                 return true;
             }
-            if (this->VerticalContentOverlap(horizOverlapingBBox, margin)) {
-                yRel = staffAlignment->CalcOverflowBelow(horizOverlapingBBox) + staffAlignment->GetStaffHeight()
-                    + GetContentY2() + margin;
+            yRel = staffAlignment->CalcOverflowBelow(horizOverlapingBBox) + staffAlignment->GetStaffHeight()
+            + GetContentY2() + margin;
+            Object *object = dynamic_cast<Object*>(horizOverlapingBBox);
+            // With LayerElement always move them down
+            if (object && object->IsLayerElement()) {
+                if (yRel > 0) this->SetDrawingYRel(yRel);
+            }
+            // Otherwise only if the is a vertical overlap
+            else if (this->VerticalContentOverlap(horizOverlapingBBox, margin)) {
                 this->SetDrawingYRel(yRel);
             }
         }