Merge pull request musescore#18501 from mike-spa/fixExpressionSnappin…

…gAboveStaff Fix expression snapping above staff
codecruisedor · Jul 10, 2023 · c543239 · c543239
2 parents 1534c16 + b47b92f
commit c543239
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 2 deletions.
diff --git a/src/engraving/layout/v0/tlayout.cpp b/src/engraving/layout/v0/tlayout.cpp
@@ -2693,8 +2693,10 @@ void TLayout::layout(HairpinSegment* item, LayoutContext& ctx)
                 }
                 if (ed->ipos().y() != ny) {
                     ed->setPosY(ny);
-                    if (ed->snappedExpression()) {
-                        ed->snappedExpression()->setPosY(ny);
+                    Expression* snappedExpression = ed->snappedExpression();
+                    if (snappedExpression) {
+                        double yOffsetDiff = snappedExpression->offset().y() - ed->offset().y();
+                        snappedExpression->setPosY(ny - yOffsetDiff);
                     }
                     if (ed->addToSkyline()) {
                         Segment* s = ed->segment();

diff --git a/src/engraving/libmscore/textbase.cpp b/src/engraving/libmscore/textbase.cpp
@@ -2766,6 +2766,8 @@ Sid TextBase::offsetSid() const
     switch (textStyleType()) {
     case TextStyleType::DYNAMICS:
         return above ? Sid::dynamicsPosAbove : Sid::dynamicsPosBelow;
+    case TextStyleType::EXPRESSION:
+        return above ? Sid::expressionPosAbove : Sid::expressionPosBelow;
     case TextStyleType::LYRICS_ODD:
     case TextStyleType::LYRICS_EVEN:
         return above ? Sid::lyricsPosAbove : Sid::lyricsPosBelow;

diff --git a/src/engraving/style/styledef.cpp b/src/engraving/style/styledef.cpp
@@ -921,6 +921,8 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
     { Sid::expressionAlign,               "expressionAlign",              Align(AlignH::LEFT, AlignV::BASELINE) },
     { Sid::expressionPlacement,           "expressionPlacement",          PlacementV::BELOW },
     { Sid::expressionOffset,              "expressionOffset",             PointF(.0, 2.5) },
+    { Sid::expressionPosAbove,            "expressionPosAbove",           PointF(.0, -1.5) },
+    { Sid::expressionPosBelow,            "expressionPosBelow",           PointF(.0, 2.5) },
     { Sid::expressionFrameType,           "expressionFrameType",          int(FrameType::NO_FRAME) },
     { Sid::expressionFramePadding,        "expressionFramePadding",       0.2 },
     { Sid::expressionFrameWidth,          "expressionFrameWidth",         0.1 },

diff --git a/src/engraving/style/styledef.h b/src/engraving/style/styledef.h
@@ -930,6 +930,8 @@ enum class Sid {
     expressionAlign,
     expressionPlacement,
     expressionOffset,
+    expressionPosAbove,
+    expressionPosBelow,
     expressionFrameType,
     expressionFramePadding,
     expressionFrameWidth,

diff --git a/src/engraving/tests/compat206_data/textstyles-ref.mscx b/src/engraving/tests/compat206_data/textstyles-ref.mscx
@@ -400,6 +400,8 @@
         <voice>
           <Expression>
             <placement>above</placement>
+            <snapToDynamics>0</snapToDynamics>
+            <offset x="0" y="3.5"/>
             <text>technique</text>
             </Expression>
           <Rest>

diff --git a/src/engraving/tests/expression_data/expression-1-ref.mscx b/src/engraving/tests/expression_data/expression-1-ref.mscx
@@ -113,6 +113,8 @@
         <voice>
           <Expression>
             <placement>above</placement>
+            <snapToDynamics>0</snapToDynamics>
+            <offset x="0" y="2.5"/>
             <text>expr text</text>
             </Expression>
           <Chord>

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