Merge pull request #18959 from mike-spa/fix#18587ExpressionSnappingTo…

…InvisibleDynamic Fix #18587: Expression snap to invisible dynamics
musescore · Aug 8, 2023 · 8e4660a · 8e4660a
2 parents 553dba2 + 84dc24b
commit 8e4660a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/src/engraving/libmscore/dynamichairpingroup.cpp b/src/engraving/libmscore/dynamichairpingroup.cpp
@@ -226,23 +226,18 @@ void DynamicNearHairpinsDragGroup::endDrag(EditData& ed)
 
 std::unique_ptr<ElementGroup> DynamicExpressionDragGroup::detectFor(Dynamic* d, std::function<bool(const EngravingItem*)> isDragged)
 {
-    Segment* segment = d->segment();
-    Expression* expression = segment ? toExpression(segment->findAnnotation(ElementType::EXPRESSION, d->track(), d->track())) : nullptr;
-    if (expression && !isDragged(expression) && expression->snapToDynamics()) {
-        return std::unique_ptr<DynamicExpressionDragGroup>(new DynamicExpressionDragGroup(d, expression));
+    Expression* snappedExpression = d->snappedExpression();
+    if (snappedExpression && !isDragged(snappedExpression)) {
+        return std::unique_ptr<DynamicExpressionDragGroup>(new DynamicExpressionDragGroup(d, snappedExpression));
     }
     return nullptr;
 }
 
 std::unique_ptr<ElementGroup> DynamicExpressionDragGroup::detectFor(Expression* e, std::function<bool(const EngravingItem*)> isDragged)
 {
-    if (!e->snapToDynamics()) {
-        return nullptr;
-    }
-    Segment* segment = e->explicitParent() ? toSegment(e->explicitParent()) : nullptr;
-    Dynamic* dynamic = segment ? toDynamic(segment->findAnnotation(ElementType::DYNAMIC, e->track(), e->track())) : nullptr;
-    if (dynamic && !isDragged(dynamic)) {
-        return std::unique_ptr<DynamicExpressionDragGroup>(new DynamicExpressionDragGroup(dynamic, e));
+    Dynamic* snappedDynamic = e->snappedDynamic();
+    if (snappedDynamic && !isDragged(snappedDynamic)) {
+        return std::unique_ptr<DynamicExpressionDragGroup>(new DynamicExpressionDragGroup(snappedDynamic, e));
     }
     return nullptr;
 }

diff --git a/src/engraving/rendering/dev/tlayout.cpp b/src/engraving/rendering/dev/tlayout.cpp
@@ -1660,7 +1660,7 @@ void TLayout::layout(Expression* item, LayoutContext& ctx)
     }
 
     Dynamic* dynamic = toDynamic(segment->findAnnotation(ElementType::DYNAMIC, item->track(), item->track()));
-    if (!dynamic || dynamic->placeAbove() != item->placeAbove()) {
+    if (!dynamic || dynamic->placeAbove() != item->placeAbove() || !dynamic->visible()) {
         item->autoplaceSegmentElement();
         return;
     }

diff --git a/vtest/scores/expression-3.mscz b/vtest/scores/expression-3.mscz