[palette] added layout for Breath

codecruisedor · Jul 10, 2023 · 0893f80 · 0893f80
1 parent 377cd4c
commit 0893f80
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/src/engraving/layout/pal/tlayout.cpp b/src/engraving/layout/pal/tlayout.cpp
@@ -600,21 +600,10 @@ void TLayout::layout(Bracket* item, LayoutContext& ctx)
     item->setShape(shape);
 }
 
-void TLayout::layout(Breath* item, LayoutContext& ctx)
-{
-    bool palette = (!item->staff() || item->track() == mu::nidx);
-    if (!palette) {
-        int voiceOffset = item->placeBelow() * (item->staff()->lines(item->tick()) - 1) * item->spatium();
-        if (item->isCaesura()) {
-            item->setPos(item->xpos(), item->spatium() + voiceOffset);
-        } else if ((ctx.conf().styleSt(Sid::MusicalSymbolFont) == "Emmentaler")
-                   && (item->symId() == SymId::breathMarkComma)) {
-            item->setPos(item->xpos(), 0.5 * item->spatium() + voiceOffset);
-        } else {
-            item->setPos(item->xpos(), -0.5 * item->spatium() + voiceOffset);
-        }
-    }
-    item->setbbox(item->symBbox(item->symId()));
+void TLayout::layout(Breath*, LayoutContext&)
+{
+    //! NOTE Moved to PaletteLayout
+    UNREACHABLE;
 }
 
 void TLayout::layout(Chord*, LayoutContext&)

diff --git a/src/palette/internal/palettelayout.cpp b/src/palette/internal/palettelayout.cpp
@@ -39,6 +39,7 @@
 #include "engraving/libmscore/bagpembell.h"
 #include "engraving/libmscore/barline.h"
 #include "engraving/libmscore/bracket.h"
+#include "engraving/libmscore/breath.h"
 #include "engraving/libmscore/capo.h"
 #include "engraving/libmscore/chordline.h"
 #include "engraving/libmscore/clef.h"
@@ -105,6 +106,8 @@ void PaletteLayout::layoutItem(EngravingItem* item)
         break;
     case ElementType::BRACKET:      layout(toBracket(item), ctx);
         break;
+    case ElementType::BREATH:       layout(toBreath(item), ctx);
+        break;
     case ElementType::CAPO:         layout(toCapo(item), ctx);
         break;
     case ElementType::CHORDLINE:    layout(toChordLine(item), ctx);
@@ -493,6 +496,11 @@ void PaletteLayout::layout(Bracket* item, const Context& ctx)
     item->setShape(shape);
 }
 
+void PaletteLayout::layout(Breath* item, const Context&)
+{
+    item->setbbox(item->symBbox(item->symId()));
+}
+
 void PaletteLayout::layout(Capo* item, const Context& ctx)
 {
     layoutTextBase(item, ctx);

diff --git a/src/palette/internal/palettelayout.h b/src/palette/internal/palettelayout.h
@@ -38,6 +38,7 @@ class Articulation;
 class BagpipeEmbellishment;
 class BarLine;
 class Bracket;
+class Breath;
 
 class Capo;
 class ChordLine;
@@ -138,6 +139,7 @@ class PaletteLayout
     static void layout(engraving::BagpipeEmbellishment* item, const Context& ctx);
     static void layout(engraving::BarLine* item, const Context& ctx);
     static void layout(engraving::Bracket* item, const Context& ctx);
+    static void layout(engraving::Breath* item, const Context&);
 
     static void layout(engraving::Capo* item, const Context& ctx);
     static void layout(engraving::ChordLine* item, const Context& ctx);