[palette] added layout for Slur

codecruisedor · Jul 10, 2023 · e433234 · e433234
1 parent 63e57ab
commit e433234
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/src/engraving/layout/pal/tlayout.cpp b/src/engraving/layout/pal/tlayout.cpp
@@ -1703,10 +1703,10 @@ void TLayout::layoutLine(SLine* item, LayoutContext& ctx)
     item->setbbox(lineSegm->bbox());
 }
 
-void TLayout::layout(Slur* item, LayoutContext& ctx)
+void TLayout::layout(Slur*, LayoutContext&)
 {
-    v0::LayoutContext ctxv0(ctx.score());
-    v0::SlurTieLayout::layout(item, ctxv0);
+    //! NOTE Moved to PaletteLayout
+    UNREACHABLE;
 }
 
 void TLayout::layout(Spacer*, LayoutContext&)

diff --git a/src/palette/internal/palettelayout.cpp b/src/palette/internal/palettelayout.cpp
@@ -68,6 +68,7 @@
 #include "engraving/libmscore/pedal.h"
 #include "engraving/libmscore/playtechannotation.h"
 #include "engraving/libmscore/rehearsalmark.h"
+#include "engraving/libmscore/slur.h"
 #include "engraving/libmscore/stafftext.h"
 #include "engraving/libmscore/symbol.h"
 #include "engraving/libmscore/systemtext.h"
@@ -173,6 +174,8 @@ void PaletteLayout::layoutItem(EngravingItem* item)
         break;
     case ElementType::REHEARSAL_MARK: layout(toRehearsalMark(item), ctx);
         break;
+    case ElementType::SLUR:         layout(toSlur(item), ctx);
+        break;
     case ElementType::SPACER:       layout(toSpacer(item), ctx);
         break;
     case ElementType::STAFF_TEXT:   layout(toStaffText(item), ctx);
@@ -1208,6 +1211,31 @@ void PaletteLayout::layout(RehearsalMark* item, const Context& ctx)
     layoutTextBase(item, ctx);
 }
 
+void PaletteLayout::layout(Slur* item, const Context& ctx)
+{
+    double spatium = item->spatium();
+    SlurSegment* s = nullptr;
+    if (item->spannerSegments().empty()) {
+        s = new SlurSegment(ctx.dummyParent()->system());
+        s->setTrack(item->track());
+        item->add(s);
+    } else {
+        s = item->frontSegment();
+    }
+
+    s->setSpannerSegmentType(SpannerSegmentType::SINGLE);
+
+    s->setPos(PointF());
+    s->ups(Grip::START).p = PointF(0, 0);
+    s->ups(Grip::END).p   = PointF(spatium * 6, 0);
+    s->setExtraHeight(0.0);
+
+    s->computeBezier();
+    s->setbbox(s->path().boundingRect());
+
+    item->setbbox(s->bbox());
+}
+
 void PaletteLayout::layout(Spacer* item, const Context&)
 {
     UNUSED(item);

diff --git a/src/palette/internal/palettelayout.h b/src/palette/internal/palettelayout.h
@@ -93,6 +93,7 @@ class PlayTechAnnotation;
 
 class RehearsalMark;
 
+class Slur;
 class Spacer;
 class StaffText;
 class Symbol;
@@ -197,6 +198,7 @@ class PaletteLayout
 
     static void layout(engraving::RehearsalMark* item, const Context& ctx);
 
+    static void layout(engraving::Slur* item, const Context& ctx);
     static void layout(engraving::Spacer* item, const Context&);
     static void layout(engraving::StaffText* item, const Context& ctx);
     static void layout(engraving::Symbol* item, const Context& ctx);