Merge pull request #22860 from miiizen/tab-full-layout

Avoid collisions in full tab layout

Author: mike-spa

src/engraving/dom/note.cpp

@@ -1005,6 +1005,10 @@ double Note::bboxRightPos() const
 //---------------------------------------------------------
 double Note::headBodyWidth() const
 {
+    const StaffType* st = staffType();
+    if (st && st->isTabStaff()) {
+        return tabHeadWidth(st);
+    }
     return headWidth() + 2 * bboxXShift();
 }
 
@@ -3818,4 +3822,10 @@ bool Note::negativeFretUsed() const
 {
     return configuration()->negativeFretsAllowed() && m_fret < 0;
 }
+
+int Note::stringOrLine() const
+{
+    // The number string() returns doesn't count spaces.  This should be used where it is expected even numbers are spaces and odd are lines
+    return staff()->staffType(tick())->isTabStaff() ? string() * 2 : line();
+}
 }

src/engraving/dom/note.h

@@ -272,6 +272,7 @@ class Note final : public EngravingItem
     bool negativeFretUsed() const;
     int string() const { return m_string; }
     void setString(int val) { m_string = val; }
+    int stringOrLine() const;
 
     bool ghost() const { return m_ghost; }
     void setGhost(bool val) { m_ghost = val; }

src/engraving/rendering/dev/chordlayout.cpp

@@ -2245,7 +2245,7 @@ void TDraw::draw(const Note* item, Painter* painter)
         const StaffType* tab = st->staffTypeForElement(item);
         // draw background, if required (to hide a segment of string line or to show a fretting conflict)
         if (!tab->linesThrough() || item->fretConflict()) {
-            double d  = item->spatium() * .1;
+            double d  = item->style().styleS(Sid::tabFretPadding).val() * item->spatium();
             RectF bb = RectF(ldata->bbox().x() - d,
                              tab->fretMaskY() * item->magS(),
                              ldata->bbox().width() + 2 * d,
@@ -2832,7 +2832,7 @@ void TDraw::draw(const Symbol* item, Painter* painter)
         // Draw background for parentheses on TAB staves
         auto config = item->configuration();
         const Symbol::LayoutData* ldata = item->ldata();
-        double d = item->spatium() * .1;
+        double d = item->style().styleS(Sid::tabFretPadding).val() * item->spatium();
         RectF bb = RectF(ldata->bbox().x() - d,
                          ldata->bbox().y() - d,
                          ldata->bbox().width() + 2 * d,

src/engraving/rendering/dev/tdraw.cpp

@@ -4321,7 +4321,7 @@ void TLayout::layoutNote(const Note* item, Note::LayoutData* ldata)
             const_cast<Note*>(item)->setHeadHasParentheses(false, /* addToLinked= */ false);
         }
 
-        double w = item->tabHeadWidth(tab);     // !! use _fretString
+        double w = item->tabHeadWidth(tab);
         double mags = item->magS();
 
         const MStyle& style = item->style();

src/engraving/rendering/dev/tlayout.cpp

@@ -1701,6 +1701,8 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
     styleDef(tabParenthesizeTiedFret,                    int(ParenthesizeTiedFret::START_OF_SYSTEM)),
     styleDef(parenthesizeTiedFretIfArticulation,         true),
 
+    styleDef(tabFretPadding,                             Spatium(0.1)),
+
     styleDef(chordlineThickness,                         Spatium(0.16)),
 
     styleDef(dummyMusicalSymbolsScale,                   1.0),

src/engraving/style/styledef.cpp

@@ -1711,6 +1711,8 @@ enum class Sid {
     tabParenthesizeTiedFret,
     parenthesizeTiedFretIfArticulation,
 
+    tabFretPadding,
+
     chordlineThickness,
 
     dummyMusicalSymbolsScale,