Fix jumps

Author: miiizen

src/engraving/dom/jump.cpp

@@ -70,7 +70,6 @@ Jump::Jump(Measure* parent)
     : TextBase(ElementType::JUMP, parent, TextStyleType::REPEAT_RIGHT, ElementFlag::MOVABLE | ElementFlag::SYSTEM | ElementFlag::ON_STAFF)
 {
     initElementStyle(&jumpStyle);
-    setLayoutToParentWidth(true);
     m_playRepeats = false;
 }
 

src/engraving/dom/jump.h

@@ -79,8 +79,6 @@ class Jump final : public TextBase
     EngravingItem* prevSegmentElement() override;
     String accessibleInfo() const override;
 
-    void setLayoutToParentWidth(bool v) { m_layoutToParentWidth = v; }
-
 private:
     String m_jumpTo;
     String m_playUntil;

src/engraving/rendering/score/tlayout.cpp

@@ -3612,33 +3612,31 @@ void TLayout::layoutJump(const Jump* item, Jump::LayoutData* ldata)
 
     layoutBaseTextBase(item, ldata);
 
-    AlignH align = item->align().horizontal;
+    AlignH position = item->position();
 
     const Measure* measure = toMeasure(item->parentItem());
+    double xAdj = measure ? measure->width() : 0.0;
 
-    bool avoidBarline = item->staffIdx() != 0 && align != AlignH::HCENTER;
-
+    bool avoidBarline = item->staffIdx() != 0 && position != AlignH::HCENTER;
     if (avoidBarline) {
         bool startRepeat = measure->repeatStart();
         bool endRepeat = measure->repeatEnd();
         staff_idx_t blIdx = item->staffIdx() - 1;
 
         const double fontSizeScaleFactor = item->size() / 10.0;
         double padding = (startRepeat || endRepeat) ? 0.0 : 0.5 * item->spatium() * fontSizeScaleFactor;
-        double xAdj = 0.0;
 
-        if (align == AlignH::LEFT) {
+        if (position == AlignH::LEFT) {
             const BarLine* bl = startRepeat || !measure->prevMeasure()
                                 ? measure->startBarLine(blIdx) : measure->prevMeasure()->endBarLine(blIdx);
             double blWidth = startRepeat ? bl->width() : 0.0;
             xAdj += padding + blWidth;
-        } else if (align == AlignH::RIGHT) {
+        } else if (position == AlignH::RIGHT) {
             const BarLine* bl = measure->endBarLine(blIdx);
             xAdj -= bl->width() + padding;
         }
-
-        ldata->moveX(xAdj);
     }
+    ldata->moveX(xAdj);
 
     if (item->autoplace()) {
         LD_CONDITION(ldata->isSetPos());